From: Soby Mathew <soby.mathew@arm.com>
Date: Thu, 3 Oct 2019 13:32:13 +0000 (+0000)
Subject: Merge "Add missing support for BL2_AT_EL3 in XIP memory" into integration
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=34c4f86a627f79b1f827e65d46675fca21987b62;hp=efcf951f6113d1ee0f47af883130512edaeaeeeb;p=project%2Fbcm63xx%2Fatf.git

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 c62d7d77..7559de44 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.
 		 * -----------------------------------------------------
diff --git a/include/arch/aarch64/el3_common_macros.S b/include/arch/aarch64/el3_common_macros.S
index 53396d44..ee20d5b2 100644
--- 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__