Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 4bddbabb10822b8f6cb28a59a426dc9c1cbf8c73

Authored by Ye Li
1 parent 3957eaafc0
Exists in smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga and in 4 other branches smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga

MLK-19973 mx6ulz: Change to load uTee-6ulzevk for 6ULZ 

When running on iMX6ULZ, need to set tee_file to uTee-6ulzevk not
uTee-6ullevk. Thus, add findtee script into env to set correct tee
file before booting.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

Showing 1 changed file with 14 additions and 1 deletions Side-by-side Diff

include/configs/mx6ullevk.h
Diff comments   View file @ 4bddbab
... ... @@ -126,7 +126,7 @@
126 126 "fdt_file=undefined\0" \
127 127 "fdt_addr=0x83000000\0" \
128 128 "tee_addr=0x84000000\0" \
129   - "tee_file=uTee-6ullevk\0" \" \
  129 + "tee_file=undefined\0" \" \
130 130 "boot_fdt=try\0" \
131 131 "ip_dyn=yes\0" \
132 132 "panel=TFT43AB\0" \
133 133  
... ... @@ -207,9 +207,22 @@
207 207 "echo WARNING: Could not determine dtb to use; " \
208 208 "fi; " \
209 209 "fi;\0" \
  210 + "findtee="\
  211 + "if test $tee_file = undefined; then " \
  212 + "if test $board_name = ULZ-EVK && test $board_rev = 14X14; then " \
  213 + "setenv tee_file uTee-6ulzevk; fi; " \
  214 + "if test $board_name = EVK && test $board_rev = 9X9; then " \
  215 + "setenv tee_file uTee-6ullevk; fi; " \
  216 + "if test $board_name = EVK && test $board_rev = 14X14; then " \
  217 + "setenv tee_file uTee-6ullevk; fi; " \
  218 + "if test $tee_file = undefined; then " \
  219 + "echo WARNING: Could not determine tee to use; " \
  220 + "fi; " \
  221 + "fi;\0" \
210 222  
211 223 #define CONFIG_BOOTCOMMAND \
212 224 "run findfdt;" \
  225 + "run findtee;" \
213 226 "mmc dev ${mmcdev};" \
214 227 "mmc dev ${mmcdev}; if mmc rescan; then " \
215 228 "if run loadbootscript; then " \