andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Lionel Debieve 2019-05-27 09:32:00 +02:00
parent c5235cae8e
commit 0a12302c3f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/arch/aarch32/el3_common_macros.S
View File

@ -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.
* ----------------------------------------------------- * -----------------------------------------------------

2
include/arch/aarch64/el3_common_macros.S
View File

@ -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__