commit d2f21b8ef73a70a4caa8c32c393cabd07b1e2fe0
author Lionel Debieve <lionel.debieve@st.com> Mon May 27 09:32:00 2019 +0200
committer Lionel Debieve <lionel.debieve@st.com> Wed Oct 02 09:06:39 2019 +0200
tree ad6721a2d2d6264b982a1e877b7120d3f3338359
parent 14e508b6b9d73100c38a70f088e11e9ba635b3bc

Add missing support for BL2_AT_EL3 in XIP memory

Add the missing flag for aarch32 XIP memory mode. It was
previously added in aarch64 only.
Minor: Correct the aarch64 missing flag.

Signed-off-by: Lionel Debieve <lionel.debieve@st.com>
Change-Id: Iac0a7581a1fd580aececa75f97deb894858f776f

include/arch/aarch32/el3_common_macros.S

diff --git a/include/arch/aarch32/el3_common_macros.S b/include/arch/aarch32/el3_common_macros.S
index c62d7d7..7559de4 100644
--- a/include/arch/aarch32/el3_common_macros.S
+++ b/include/arch/aarch32/el3_common_macros.S
@@ -339,7 +339,7 @@
 		bl	zeromem
 #endif
 
-#ifdef IMAGE_BL1
+#if defined(IMAGE_BL1) || (defined(IMAGE_BL2) && BL2_AT_EL3 && BL2_IN_XIP_MEM)
 		/* -----------------------------------------------------
 		 * Copy data from ROM to RAM.
 		 * -----------------------------------------------------