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

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>
This commit is contained in:
Roberto Vargas 2018-04-11 11:53:31 +01:00
parent 00b7db3038
commit 5629b2b11c
9 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bl1/bl1.ld.S
View File

@ -28,7 +28,7 @@ SECTIONS
*bl1_entrypoint.o(.text*)
*(.text*)
*(.vectors)
. = NEXT(PAGE_SIZE);
. = ALIGN(PAGE_SIZE);
__TEXT_END__ = .;
} >ROM
@ -152,7 +152,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

8
bl2/bl2.ld.S
View File

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

8
bl2/bl2_el3.ld.S
View File

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

8
bl2u/bl2u.ld.S
View File

@ -28,14 +28,14 @@ SECTIONS
*bl2u_entrypoint.o(.text*)
*(.text*)
*(.vectors)
. = NEXT(PAGE_SIZE);
. = ALIGN(PAGE_SIZE);
__TEXT_END__ = .;
} >RAM
.rodata . : {
__RODATA_START__ = .;
*(.rodata*)
. = NEXT(PAGE_SIZE);
. = ALIGN(PAGE_SIZE);
__RODATA_END__ = .;
} >RAM
#else
@ -52,7 +52,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
@ -118,7 +118,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

10
bl31/bl31.ld.S
View File

@ -32,7 +32,7 @@ SECTIONS
*bl31_entrypoint.o(.text*)
*(.text*)
*(.vectors)
. = NEXT(PAGE_SIZE);
. = ALIGN(PAGE_SIZE);
__TEXT_END__ = .;
} >RAM
@ -67,7 +67,7 @@ SECTIONS
. = ALIGN(8);
#include <pubsub_events.h>
. = NEXT(PAGE_SIZE);
. = ALIGN(PAGE_SIZE);
__RODATA_END__ = .;
} >RAM
#else
@ -111,7 +111,7 @@ SECTIONS
* 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
spm_shim_exceptions : ALIGN(PAGE_SIZE) {
__SPM_SHIM_EXCEPTIONS_START__ = .;
*(.spm_shim_exceptions)
. = NEXT(PAGE_SIZE);
. = ALIGN(PAGE_SIZE);
__SPM_SHIM_EXCEPTIONS_END__ = .;
} >RAM
#endif
@ -246,7 +246,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

8
bl32/sp_min/sp_min.ld.S
View File

@ -28,7 +28,7 @@ SECTIONS
*entrypoint.o(.text*)
*(.text*)
*(.vectors)
. = NEXT(PAGE_SIZE);
. = ALIGN(PAGE_SIZE);
__TEXT_END__ = .;
} >RAM
@ -55,7 +55,7 @@ SECTIONS
. = ALIGN(8);
#include <pubsub_events.h>
. = NEXT(PAGE_SIZE);
. = ALIGN(PAGE_SIZE);
__RODATA_END__ = .;
} >RAM
#else
@ -92,7 +92,7 @@ SECTIONS
* read-only, executable. No RW data from the next section must
* creep in. Ensure the rest of the current memory block is unused.
*/
. = NEXT(PAGE_SIZE);
. = ALIGN(PAGE_SIZE);
__RO_END__ = .;
} >RAM
#endif
@ -207,7 +207,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

8
bl32/tsp/tsp.ld.S
View File

@ -29,14 +29,14 @@ SECTIONS
*tsp_entrypoint.o(.text*)
*(.text*)
*(.vectors)
. = NEXT(PAGE_SIZE);
. = ALIGN(PAGE_SIZE);
__TEXT_END__ = .;
} >RAM
.rodata . : {
__RODATA_START__ = .;
*(.rodata*)
. = NEXT(PAGE_SIZE);
. = ALIGN(PAGE_SIZE);
__RODATA_END__ = .;
} >RAM
#else
@ -52,7 +52,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
@ -117,7 +117,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

4
include/plat/arm/common/arm_common.ld.S
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -22,7 +22,7 @@ SECTIONS
*(arm_el3_tzc_dram)
__EL3_SEC_DRAM_UNALIGNED_END__ = .;
. = NEXT(PAGE_SIZE);
. = ALIGN(PAGE_SIZE);
__EL3_SEC_DRAM_END__ = .;
} >EL3_SEC_DRAM
}

4
plat/mediatek/mt6795/bl31.ld.S
View File

@ -59,7 +59,7 @@ SECTIONS
* 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
@ -161,7 +161,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__ = .;
} >RAM2
#endif