Commit c7b3a7ee5351 ("optee: adjust dependencies and default values for
dram") wants to skip low-level init of i.MX7 hardware in the case where
OP-TEE has already run and u-boot is being run as BL33 in normal world.Currently we check for both #ifdef CONFIG_OPTEE_TZDRAM_SIZE and #ifndef CONFIG_OPTEE to determine if lowlevel init should be skipped, however, in order to ensure non-OPTEE users never see OPTEE related defines we cannot rely on this method. Fortunately we can use CONFIG_BOOTM_OPTEE for the same purpose. CONFIG_BOOTM_OPTEE is only relevant if you want u-boot to load OP-TEE not if u-boot has already been loaded by OP-TEE. Signed-off-by: Bryan O'Donoghue <bryan.odonog...@linaro.org> Cc: Fabio Estevam <fabio.este...@nxp.com> Cc: Breno Lima <breno.l...@nxp.com> Cc: Rui Miguel Silva <rui.si...@linaro.org> --- include/configs/warp7.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 043f2861b6..458cb8fe10 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -18,11 +18,9 @@ * launched by OPTEE, because of that we shall skip all the low level * initialization since it was already done by ATF or OPTEE */ -#ifdef CONFIG_OPTEE_TZDRAM_SIZE -#ifndef CONFIG_OPTEE +#ifndef CONFIG_BOOTM_OPTEE #define CONFIG_SKIP_LOWLEVEL_INIT #endif -#endif #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR -- 2.20.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
