| Message ID | 20190508181448.20452-8-bryan.odonoghue@linaro.org |
|---|---|
| State | Accepted |
| Commit | 2528a666aea244b20abf7b387039b10b1d8c2d76 |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | Switch WaRP7 BL33 to mbed Linux specific bootflow | expand |
> If no CONFIG_OPTEE_LOAD_ADDR is provided i.e. you are not loading OPTEE > into memory in u-boot, then just set the non-existent CONFIG option to > zero, elsewise stringify(CONFIG_OPTEE_LOAD_ADDR) will return > "CONFIG_OPTEE_LOAD_ADDR" - which looks weird in the u-boot environment. > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/include/configs/warp7.h b/include/configs/warp7.h index bab23cfdca..8c31d72205 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -45,6 +45,10 @@ #define BOOT_SCR_STRING "source ${bootscriptaddr}\0" #endif +#ifndef CONFIG_OPTEE_LOAD_ADDR +#define CONFIG_OPTEE_LOAD_ADDR 0 +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_DFU_ENV_SETTINGS \ "script=boot.scr\0" \
If no CONFIG_OPTEE_LOAD_ADDR is provided i.e. you are not loading OPTEE into memory in u-boot, then just set the non-existent CONFIG option to zero, elsewise stringify(CONFIG_OPTEE_LOAD_ADDR) will return "CONFIG_OPTEE_LOAD_ADDR" - which looks weird in the u-boot environment. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- include/configs/warp7.h | 4 ++++ 1 file changed, 4 insertions(+)