Skip to content

GitLab

Commit 34c4f86a authored by Soby Mathew's avatar Soby Mathew Committed by TrustedFirmware Code Review
Browse files

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

parents efcf951f 0a12302c
Show whitespace changes
Inline Side-by-side
include/arch/aarch32/el3_common_macros.S
View file @ 34c4f86a
...@@ -339,7 +339,7 @@ ...@@ -339,7 +339,7 @@
bl zeromem bl zeromem
#endif #endif
#ifdef IMAGE_BL1 #if defined(IMAGE_BL1) || (defined(IMAGE_BL2) && BL2_AT_EL3 && BL2_IN_XIP_MEM)
/* ----------------------------------------------------- /* -----------------------------------------------------
* Copy data from ROM to RAM. * Copy data from ROM to RAM.
* ----------------------------------------------------- * -----------------------------------------------------
......
include/arch/aarch64/el3_common_macros.S
View file @ 34c4f86a
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
bl zeromem bl zeromem
#endif #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__ adrp x0, __DATA_RAM_START__
add x0, x0, :lo12:__DATA_RAM_START__ add x0, x0, :lo12:__DATA_RAM_START__
adrp x1, __DATA_ROM_START__ adrp x1, __DATA_ROM_START__
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment