From e6a34a7e6ce89dacf3fee6e99f2a6fc97ea49937 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Thu, 20 Sep 2018 02:20:51 -0700 Subject: [PATCH] MLK-19645 mx6ulz_evk: Fix fdt_file variable issue Since we set the fdt_file value when running on iMX6ULZ. This cause the saved fdt_file change be overwritten. So users can't set to their own fdt_file. Signed-off-by: Ye Li Reviewed-by: Peng Fan (cherry picked from commit 389161ef31bed9dad5a502fb24e445402e1465eb) (cherry picked from commit 40ca6115b88597c27df3d4a27c0caa50a5b0a63a) --- board/freescale/mx6ullevk/mx6ullevk.c | 2 +- include/configs/mx6ullevk.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c index 76f06557a5..0ddac9c6b6 100644 --- a/board/freescale/mx6ullevk/mx6ullevk.c +++ b/board/freescale/mx6ullevk/mx6ullevk.c @@ -397,7 +397,7 @@ int board_late_init(void) env_set("board_rev", "14X14"); if (is_cpu_type(MXC_CPU_MX6ULZ)) { - env_set("fdt_file", "imx6ulz-14x14-evk.dtb"); + env_set("board_name", "ULZ-EVK"); env_set("usb_net_cmd", "usb start"); } #endif diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index f74066a5e6..266f3f4cb5 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -191,6 +191,8 @@ "fi;\0" \ "findfdt="\ "if test $fdt_file = undefined; then " \ + "if test $board_name = ULZ-EVK && test $board_rev = 14X14; then " \ + "setenv fdt_file imx6ulz-14x14-evk.dtb; fi; " \ "if test $board_name = EVK && test $board_rev = 9X9; then " \ "setenv fdt_file imx6ull-9x9-evk.dtb; fi; " \ "if test $board_name = EVK && test $board_rev = 14X14; then " \ -- 2.17.1