Merge "Add missing support for BL2_AT_EL3 in XIP memory" into integration

diff --git a/include/arch/aarch32/el3_common_macros.S b/include/arch/aarch32/el3_common_macros.S
index c62d7d772d58f55ab6c78e071b8b692675faf0ab..7559de446606d2addc795821c86a3e3fb370a3d6 100644 (file)
--- 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.
                 * -----------------------------------------------------

diff --git a/include/arch/aarch64/el3_common_macros.S b/include/arch/aarch64/el3_common_macros.S
index 53396d44b6285f425c0f1b6e4a6bbfd09e831864..ee20d5b2dcb05df231aa6b2e231eaa847d5e7bbe 100644 (file)
--- a/include/arch/aarch64/el3_common_macros.S
+++ b/include/arch/aarch64/el3_common_macros.S
@@ -366,7 +366,7 @@
                bl      zeromem
 #endif
 
-#if defined(IMAGE_BL1) || (defined(IMAGE_BL2) && BL2_IN_XIP_MEM)
+#if defined(IMAGE_BL1) || (defined(IMAGE_BL2) && BL2_AT_EL3 && BL2_IN_XIP_MEM)
                adrp    x0, __DATA_RAM_START__
                add     x0, x0, :lo12:__DATA_RAM_START__
                adrp    x1, __DATA_ROM_START__