Merge "Add missing support for BL2_AT_EL3 in XIP memory" into integration
This commit is contained in:
commit
34c4f86a62
|
@ -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.
|
||||||
* -----------------------------------------------------
|
* -----------------------------------------------------
|
||||||
|
|
|
@ -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__
|
||||||
|
|
Loading…
Reference in New Issue