[U-Boot] [PATCH] ARM: imx6logic: Stop overwriting fdt_file if manually set

The board file uses the processor type to determine what dtb file is set. Unfortunately, if the user wants to manually set this, it get gets overwritten upon boot. This patch adds a check to see if the value is already set and only changes it if the value is empty.
Signed-off-by: Adam Ford aford173@gmail.com
diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c index b17a3b1d39..53e609e15c 100644 --- a/board/logicpd/imx6/imx6logic.c +++ b/board/logicpd/imx6/imx6logic.c @@ -152,7 +152,8 @@ int board_late_init(void)
if (is_mx6dq()) { env_set("board_rev", "MX6DQ"); - env_set("fdt_file", "imx6q-logicpd.dtb"); + if (!env_get("fdt_file")) + env_set("fdt_file", "imx6q-logicpd.dtb"); }
return 0;

On Wed, Mar 13, 2019 at 10:49 AM Adam Ford aford173@gmail.com wrote:
The board file uses the processor type to determine what dtb file is set. Unfortunately, if the user wants to manually set this, it get gets overwritten upon boot. This patch adds a check to see if the value is already set and only changes it if the value is empty.
Signed-off-by: Adam Ford aford173@gmail.com
Gentle nudge to try and get this into the next release.
thanks
adam
diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c index b17a3b1d39..53e609e15c 100644 --- a/board/logicpd/imx6/imx6logic.c +++ b/board/logicpd/imx6/imx6logic.c @@ -152,7 +152,8 @@ int board_late_init(void)
if (is_mx6dq()) { env_set("board_rev", "MX6DQ");
env_set("fdt_file", "imx6q-logicpd.dtb");
if (!env_get("fdt_file"))
env_set("fdt_file", "imx6q-logicpd.dtb"); } return 0;
-- 2.17.1

The board file uses the processor type to determine what dtb file is set. Unfortunately, if the user wants to manually set this, it get gets overwritten upon boot. This patch adds a check to see if the value is already set and only changes it if the value is empty. Signed-off-by: Adam Ford aford173@gmail.com diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c index b17a3b1d39..53e609e15c 100644 --- a/board/logicpd/imx6/imx6logic.c +++ b/board/logicpd/imx6/imx6logic.c @@ -152,7 +152,8 @@ int board_late_init(void)
if (is_mx6dq()) { env_set("board_rev", "MX6DQ");
env_set("fdt_file", "imx6q-logicpd.dtb");
if (!env_get("fdt_file"))
env_set("fdt_file", "imx6q-logicpd.dtb");
}
return 0;
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
participants (2)
-
Adam Ford
-
sbabic@denx.de