From a9bcf937c9809d3a5e664f851543269812d8864f Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Wed, 13 Mar 2019 10:49:22 -0500 Subject: 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 --- board/logicpd/imx6/imx6logic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'board/logicpd') 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; -- cgit v1.2.3