diff options
author | Roberto Vargas <roberto.vargas@arm.com> | 2018-04-11 11:53:31 +0100 |
---|---|---|
committer | Roberto Vargas <roberto.vargas@arm.com> | 2018-07-11 09:21:02 +0100 |
commit | 5629b2b11ccbb422847cae776d5faf9bdc5cb5dd (patch) | |
tree | 2d81208c8c13f6cba6eb25459c4bf09c74cb95f6 /bl2 | |
parent | 00b7db30383276e3502d8b52a909c61698f31d6d (diff) |
Use ALIGN instead of NEXT in linker scripts
Clang linker doesn't support NEXT. As we are not using the MEMORY command
to define discontinuous memory for the output file in any of the linker
scripts, ALIGN and NEXT are equivalent.
Change-Id: I867ffb9c9a76d4e81c9ca7998280b2edf10efea0
Signed-off-by: Roberto Vargas <roberto.vargas@arm.com>
Diffstat (limited to 'bl2')
-rw-r--r-- | bl2/bl2.ld.S | 8 | ||||
-rw-r--r-- | bl2/bl2_el3.ld.S | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bl2/bl2.ld.S b/bl2/bl2.ld.S index 69c22eb3..5935a64b 100644 --- a/bl2/bl2.ld.S +++ b/bl2/bl2.ld.S @@ -28,7 +28,7 @@ SECTIONS *bl2_entrypoint.o(.text*) *(.text*) *(.vectors) - . = NEXT(PAGE_SIZE); + . = ALIGN(PAGE_SIZE); __TEXT_END__ = .; } >RAM @@ -42,7 +42,7 @@ SECTIONS KEEP(*(.img_parser_lib_descs)) __PARSER_LIB_DESCS_END__ = .; - . = NEXT(PAGE_SIZE); + . = ALIGN(PAGE_SIZE); __RODATA_END__ = .; } >RAM #else @@ -65,7 +65,7 @@ SECTIONS * read-only, executable. No RW data from the next section must * creep in. Ensure the rest of the current memory page is unused. */ - . = NEXT(PAGE_SIZE); + . = ALIGN(PAGE_SIZE); __RO_END__ = .; } >RAM #endif @@ -131,7 +131,7 @@ SECTIONS * as device memory. No other unexpected data must creep in. * Ensure the rest of the current memory page is unused. */ - . = NEXT(PAGE_SIZE); + . = ALIGN(PAGE_SIZE); __COHERENT_RAM_END__ = .; } >RAM #endif diff --git a/bl2/bl2_el3.ld.S b/bl2/bl2_el3.ld.S index 0f91edc9..82ab427d 100644 --- a/bl2/bl2_el3.ld.S +++ b/bl2/bl2_el3.ld.S @@ -42,7 +42,7 @@ SECTIONS __TEXT_RESIDENT_END__ = .; *(.text*) *(.vectors) - . = NEXT(PAGE_SIZE); + . = ALIGN(PAGE_SIZE); __TEXT_END__ = .; #if BL2_IN_XIP_MEM } >ROM @@ -69,7 +69,7 @@ SECTIONS KEEP(*(cpu_ops)) __CPU_OPS_END__ = .; - . = NEXT(PAGE_SIZE); + . = ALIGN(PAGE_SIZE); __RODATA_END__ = .; #if BL2_IN_XIP_MEM } >ROM @@ -111,7 +111,7 @@ SECTIONS * read-only, executable. No RW data from the next section must * creep in. Ensure the rest of the current memory page is unused. */ - . = NEXT(PAGE_SIZE); + . = ALIGN(PAGE_SIZE); __RO_END__ = .; #if BL2_IN_XIP_MEM @@ -195,7 +195,7 @@ SECTIONS * as device memory. No other unexpected data must creep in. * Ensure the rest of the current memory page is unused. */ - . = NEXT(PAGE_SIZE); + . = ALIGN(PAGE_SIZE); __COHERENT_RAM_END__ = .; } >RAM #endif |