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-15 20:11:21 +0000 |
| commit | e695e7bfe14ef478ce5e983b8dd89511544ed20a (patch) | |
| tree | 25fafe66207ca411ddd6a6a11f6928d856d9dae8 | |
| parent | 0a35577ba0a2d23a8c8f088dbcdbedb3490a47e9 (diff) | |
HACK: optee is in ext part not fatlinaro-20171115-001
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rw-r--r-- | include/configs/warp7.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 3da5747ed8..a8aafa12cb 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -22,7 +22,8 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR #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_FAT_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" \ + "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_FAT_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; " \ |