Merge "sp_min: Avoid platform security reconfiguration" into integration

2020-09-01 16:27:14 +00:00 · 2020-09-01 16:27:14 +00:00 · 5903ac1e91
parent b020586a50 ae0e09bb21
commit 5903ac1e91
1 changed files with 1 additions and 1 deletions
--- a/plat/arm/common/sp_min/arm_sp_min_setup.c
+++ b/plat/arm/common/sp_min/arm_sp_min_setup.c
@ -186,7 +186,7 @@ void sp_min_platform_setup(void)
 	 * Do initial security configuration to allow DRAM/device access
 	 * (if earlier BL has not already done so).
 	 */
-#if RESET_TO_SP_MIN
+#if RESET_TO_SP_MIN && !JUNO_AARCH32_EL3_RUNTIME
 	plat_arm_security_setup();

 #if defined(PLAT_ARM_MEM_PROT_ADDR)