diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-12-08 16:29:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 16:29:19 +0000 |
| commit | 57b1c0d764d3d5d8875a7b57438df9532004ce93 (patch) | |
| tree | 0e0fc898dec3d2260ad135814c83ae3c6e2d3893 /bl32/tsp/tsp.ld.S | |
| parent | 64b978fb1e4291be512d699ce7176a155d00604c (diff) | |
| parent | a2aedac221d36624ee1da27741b7f2a0daaa6345 (diff) | |
| download | platform_external_arm-trusted-firmware-57b1c0d764d3d5d8875a7b57438df9532004ce93.tar.gz platform_external_arm-trusted-firmware-57b1c0d764d3d5d8875a7b57438df9532004ce93.tar.bz2 platform_external_arm-trusted-firmware-57b1c0d764d3d5d8875a7b57438df9532004ce93.zip | |
Merge pull request #1174 from antonio-nino-diaz-arm/an/page-size
Replace magic numbers in linkerscripts by PAGE_SIZE
Diffstat (limited to 'bl32/tsp/tsp.ld.S')
| -rw-r--r-- | bl32/tsp/tsp.ld.S | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bl32/tsp/tsp.ld.S b/bl32/tsp/tsp.ld.S index 2b672efee..d256b46c8 100644 --- a/bl32/tsp/tsp.ld.S +++ b/bl32/tsp/tsp.ld.S @@ -5,6 +5,7 @@ */ #include <platform_def.h> +#include <xlat_tables_defs.h> OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_ARCH(PLATFORM_LINKER_ARCH) @@ -19,7 +20,7 @@ MEMORY { SECTIONS { . = BL32_BASE; - ASSERT(. == ALIGN(4096), + ASSERT(. == ALIGN(PAGE_SIZE), "BL32_BASE address is not aligned on a page boundary.") #if SEPARATE_CODE_AND_RODATA @@ -28,14 +29,14 @@ SECTIONS *tsp_entrypoint.o(.text*) *(.text*) *(.vectors) - . = NEXT(4096); + . = NEXT(PAGE_SIZE); __TEXT_END__ = .; } >RAM .rodata . : { __RODATA_START__ = .; *(.rodata*) - . = NEXT(4096); + . = NEXT(PAGE_SIZE); __RODATA_END__ = .; } >RAM #else @@ -51,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(4096); + . = NEXT(PAGE_SIZE); __RO_END__ = .; } >RAM #endif @@ -106,7 +107,7 @@ SECTIONS * are not mixed with normal data. This is required to set up the correct * memory attributes for the coherent data page tables. */ - coherent_ram (NOLOAD) : ALIGN(4096) { + coherent_ram (NOLOAD) : ALIGN(PAGE_SIZE) { __COHERENT_RAM_START__ = .; *(tzfw_coherent_mem) __COHERENT_RAM_END_UNALIGNED__ = .; @@ -115,7 +116,7 @@ SECTIONS * as device memory. No other unexpected data must creep in. * Ensure the rest of the current memory page is unused. */ - . = NEXT(4096); + . = NEXT(PAGE_SIZE); __COHERENT_RAM_END__ = .; } >RAM #endif |