diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2017-11-15 20:11:21 +0000 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2017-11-16 10:35:39 +0000 |
| commit | c998f4cdfa0a3cb3118b22e7ea8097635beaa03c (patch) | |
| tree | e57f61b52f328d7a99c6d662d550a50825e3f0eb | |
| parent | 0a35577ba0a2d23a8c8f088dbcdbedb3490a47e9 (diff) | |
warp7: load optee from the ext2 partitionlinaro-20171116-001
uTee.optee is copied into the ext2 partition, along side the rootfs, in
the /lib/firmware directory.
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rw-r--r-- | include/configs/warp7.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 3da5747ed8..ba96365ec0 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -23,6 +23,7 @@ #define CONFIG_SUPPORT_EMMC_BOOT #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 +#define CONFIG_SYS_MMC_IMG_EXT_PART 2 #define CONFIG_SYS_FDT_ADDR 0x83000000 @@ -39,12 +40,13 @@ "initrd_high=0xffffffff\0" \ "fdt_file=imx7s-warp.dtb\0" \ "fdt_addr=" __stringify(CONFIG_SYS_FDT_ADDR)"\0" \ - "optee_file=uTee.optee\0" \ + "optee_file=/lib/firmware/uTee.optee\0" \ "optee_addr=" __stringify(CONFIG_OPTEE_LOAD_ADDR)"\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ + "mmcextpart=" __stringify(CONFIG_SYS_MMC_IMG_EXT_PART) "\0" \ "finduuid=part uuid mmc 0:2 uuid\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=PARTUUID=${uuid} rootwait rw\0" \ @@ -54,7 +56,7 @@ "source\0" \ "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ - "loadoptee=fatload mmc ${mmcdev}:${mmcpart} ${optee_addr} ${optee_file}\0" \ + "loadoptee=ext2load mmc ${mmcdev}:${mmcextpart} ${optee_addr} ${optee_file}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run finduuid; " \ "run mmcargs; " \ |