diff options
author | Manish Pandey <manish.pandey2@arm.com> | 2020-10-15 21:12:49 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-10-15 21:12:49 +0000 |
commit | 3bddca4b3e87ac64ced57ead2a5f94bafc2a9ee1 (patch) | |
tree | e351ff146ea7ce45b85a86a7e93c533b64a79c27 | |
parent | dfe577a817d8384c313f0a184be75efeb3cd8445 (diff) | |
parent | fdd97d7c64edb256812e786a7aa224a3010a7fec (diff) | |
download | trusted-firmware-a-3bddca4b3e87ac64ced57ead2a5f94bafc2a9ee1.tar.gz |
Merge changes I0005959b,I2ea59edb into integration
* changes:
bl32: add an assert on BL32_SIZE in sp_min.ld.S
bl32: use SORT_BY_ALIGNMENT macro in sp_min.ld.S
-rw-r--r-- | bl32/sp_min/sp_min.ld.S | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/bl32/sp_min/sp_min.ld.S b/bl32/sp_min/sp_min.ld.S index 9e0596f1f0..f202c7ada8 100644 --- a/bl32/sp_min/sp_min.ld.S +++ b/bl32/sp_min/sp_min.ld.S @@ -22,14 +22,14 @@ MEMORY { SECTIONS { . = BL32_BASE; - ASSERT(. == ALIGN(PAGE_SIZE), - "BL32_BASE address is not aligned on a page boundary.") + ASSERT(. == ALIGN(PAGE_SIZE), + "BL32_BASE address is not aligned on a page boundary.") #if SEPARATE_CODE_AND_RODATA .text . : { __TEXT_START__ = .; *entrypoint.o(.text*) - *(.text*) + *(SORT_BY_ALIGNMENT(.text*)) *(.vectors) . = ALIGN(PAGE_SIZE); __TEXT_END__ = .; @@ -46,7 +46,7 @@ SECTIONS .rodata . : { __RODATA_START__ = .; - *(.rodata*) + *(SORT_BY_ALIGNMENT(.rodata*)) RODATA_COMMON @@ -61,8 +61,8 @@ SECTIONS ro . : { __RO_START__ = .; *entrypoint.o(.text*) - *(.text*) - *(.rodata*) + *(SORT_BY_ALIGNMENT(.text*)) + *(SORT_BY_ALIGNMENT(.rodata*)) RODATA_COMMON @@ -76,7 +76,7 @@ SECTIONS /* * Memory page(s) mapped to this section will be marked as * read-only, executable. No RW data from the next section must - * creep in. Ensure the rest of the current memory block is unused. + * creep in. Ensure the rest of the current memory page is unused. */ . = ALIGN(PAGE_SIZE); __RO_END__ = .; @@ -134,10 +134,12 @@ SECTIONS #endif /* - * Define a linker symbol to mark end of the RW memory area for this + * Define a linker symbol to mark the end of the RW memory area for this * image. */ __RW_END__ = .; - __BL32_END__ = .; + __BL32_END__ = .; + + ASSERT(. <= BL32_LIMIT, "BL32 image has exceeded its limit.") } |