summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ford <aford173@gmail.com>2019-03-13 10:49:22 -0500
committerStefano Babic <sbabic@denx.de>2019-06-11 10:42:48 +0200
commita9bcf937c9809d3a5e664f851543269812d8864f (patch)
tree73a74aec55b4a9716dddcdebe1f39e595b44b46d
parent6d277fb0ed145f82dd50cc6e99d2fa553a588c3b (diff)
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>
-rw-r--r--board/logicpd/imx6/imx6logic.c3
1 files changed, 2 insertions, 1 deletions
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;