ARM: imx6logic: Stop overwriting fdt_file if manually set
authorAdam Ford <aford173@gmail.com>
Wed, 13 Mar 2019 15:49:22 +0000 (10:49 -0500)
committerStefano Babic <sbabic@denx.de>
Tue, 11 Jun 2019 08:42:48 +0000 (10:42 +0200)
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>
board/logicpd/imx6/imx6logic.c

index b17a3b1d39634324a60562fd9d227b1c529df5fd..53e609e15cf9d8d3eff099d0160d539433a44666 100644 (file)
@@ -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;