diff options
| author | Ye Li <ye.li@nxp.com> | 2018-09-20 02:20:51 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-09-20 02:35:57 -0700 |
| commit | 389161ef31bed9dad5a502fb24e445402e1465eb (patch) | |
| tree | 33903d849eacb77d0c275a294f9c29b3e57fa824 | |
| parent | 9018cc2ba39d079625c6856347c787bb8642c270 (diff) | |
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 <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
| -rw-r--r-- | board/freescale/mx6ullevk/mx6ullevk.c | 2 | ||||
| -rw-r--r-- | include/configs/mx6ullevk.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c index 8465262c8a..eeebcb3853 100644 --- a/board/freescale/mx6ullevk/mx6ullevk.c +++ b/board/freescale/mx6ullevk/mx6ullevk.c @@ -503,7 +503,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 d811c86ec6..ecc39af38c 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -197,6 +197,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 " \ |