diff options
| author | Lionel Debieve <lionel.debieve@st.com> | 2019-05-27 09:32:00 +0200 |
|---|---|---|
| committer | Lionel Debieve <lionel.debieve@st.com> | 2019-10-02 09:06:39 +0200 |
| commit | 0a12302c3ff290fd5925313d7ba834209eeed671 (patch) | |
| tree | ad6721a2d2d6264b982a1e877b7120d3f3338359 /include | |
| parent | c5235cae8e0c7c70ae9b4a8c41d77db17c885418 (diff) | |
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
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__ |