diff options
author | Bryan O'Donoghue <bryan.odonoghue@linaro.org> | 2017-09-13 12:24:27 +0100 |
---|---|---|
committer | Bryan O'Donoghue <bryan.odonoghue@linaro.org> | 2017-10-09 15:44:05 +0100 |
commit | 0a35577ba0a2d23a8c8f088dbcdbedb3490a47e9 (patch) | |
tree | 056dc66a73a8dda23d4d4b9687db34095a0ac170 | |
parent | 7c5db688fe0f2f16e001d1e51739dfd415dbd62c (diff) |
warp7: Specify CONFIG_OPTEE_LOAD_ADDRlinaro-20170913-002
In order to sign images with the IMX code-signing-tool (CST) we need to
know the load address of a given image. The best way to derive this load
address is to make it into a define - so that include/autoconf.mk contains
the address - which we can then parse when generating the IMX CST headers.
This patch makes the OPTEE_LOAD_ADDR available via autoconf.mk for further
parsing by external tools.
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: Ryan Harkin <ryan.harkin@linaro.org>
-rw-r--r-- | configs/warp7_defconfig | 1 | ||||
-rw-r--r-- | configs/warp7_secure_optee_defconfig | 1 | ||||
-rw-r--r-- | include/configs/warp7.h | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index aa491b2b30..42e394b9d8 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -40,3 +40,4 @@ CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y CONFIG_OPTEE=y +CONFIG_OPTEE_LOAD_ADDR=0x84000000 diff --git a/configs/warp7_secure_optee_defconfig b/configs/warp7_secure_optee_defconfig index 6235f6fdfd..0c00324ae5 100644 --- a/configs/warp7_secure_optee_defconfig +++ b/configs/warp7_secure_optee_defconfig @@ -39,3 +39,4 @@ CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y CONFIG_OPTEE=y +CONFIG_OPTEE_LOAD_ADDR=0x84000000 diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 4b6de1a565..3da5747ed8 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -40,7 +40,7 @@ "fdt_file=imx7s-warp.dtb\0" \ "fdt_addr=" __stringify(CONFIG_SYS_FDT_ADDR)"\0" \ "optee_file=uTee.optee\0" \ - "optee_addr=0x84000000\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" \ |