diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-10-03 13:32:13 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-10-03 13:32:13 +0000 |
| commit | 34c4f86a627f79b1f827e65d46675fca21987b62 (patch) | |
| tree | b575bb06fb1477d7f7f14154649b76ce1aad5166 /include | |
| parent | efcf951f6113d1ee0f47af883130512edaeaeeeb (diff) | |
| parent | 0a12302c3ff290fd5925313d7ba834209eeed671 (diff) | |
Merge "Add missing support for BL2_AT_EL3 in XIP memory" into integration
Diffstat (limited to 'include')
| -rw-r--r-- | include/arch/aarch32/el3_common_macros.S | 2 | ||||
| -rw-r--r-- | include/arch/aarch64/el3_common_macros.S | 2 |
2 files changed, 2 insertions, 2 deletions
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__ |