diff options
| author | Ye Li <ye.li@nxp.com> | 2019-01-03 01:32:28 -0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2019-01-07 21:52:51 -0800 |
| commit | 4bddbabb10822b8f6cb28a59a426dc9c1cbf8c73 (patch) | |
| tree | b8e35b01137dc3d63c83c3caaab595beb1fc3d40 /include | |
| parent | 3957eaafc03ac4fd15190f5d6c81e2ddfbb8dc78 (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6ullevk.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index ecc39af38c7..123acc460ad 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -126,7 +126,7 @@ "fdt_file=undefined\0" \ "fdt_addr=0x83000000\0" \ "tee_addr=0x84000000\0" \ - "tee_file=uTee-6ullevk\0" \ + "tee_file=undefined\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ "panel=TFT43AB\0" \ @@ -207,9 +207,22 @@ "echo WARNING: Could not determine dtb to use; " \ "fi; " \ "fi;\0" \ + "findtee="\ + "if test $tee_file = undefined; then " \ + "if test $board_name = ULZ-EVK && test $board_rev = 14X14; then " \ + "setenv tee_file uTee-6ulzevk; fi; " \ + "if test $board_name = EVK && test $board_rev = 9X9; then " \ + "setenv tee_file uTee-6ullevk; fi; " \ + "if test $board_name = EVK && test $board_rev = 14X14; then " \ + "setenv tee_file uTee-6ullevk; fi; " \ + "if test $tee_file = undefined; then " \ + "echo WARNING: Could not determine tee to use; " \ + "fi; " \ + "fi;\0" \ #define CONFIG_BOOTCOMMAND \ "run findfdt;" \ + "run findtee;" \ "mmc dev ${mmcdev};" \ "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootscript; then " \ |