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

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

This commit is contained in:
Soby Mathew 2019-10-03 13:32:13 +00:00 committed by TrustedFirmware Code Review
parent efcf951f61 0a12302c3f
commit 34c4f86a62
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
#endif
#ifdef IMAGE_BL1
#if defined(IMAGE_BL1) || (defined(IMAGE_BL2) && BL2_AT_EL3 && BL2_IN_XIP_MEM)
/* -----------------------------------------------------
* Copy data from ROM to RAM.
* -----------------------------------------------------

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

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