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 /include | |
| 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 'include')
| -rw-r--r-- | include/plat/arm/common/arm_common.ld.S | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/plat/arm/common/arm_common.ld.S b/include/plat/arm/common/arm_common.ld.S index 478b08c2a..6edfa099d 100644 --- a/include/plat/arm/common/arm_common.ld.S +++ b/include/plat/arm/common/arm_common.ld.S @@ -6,6 +6,8 @@ #ifndef __ARM_COMMON_LD_S__ #define __ARM_COMMON_LD_S__ +#include <xlat_tables_defs.h> + MEMORY { EL3_SEC_DRAM (rw): ORIGIN = ARM_EL3_TZC_DRAM1_BASE, LENGTH = ARM_EL3_TZC_DRAM1_SIZE } @@ -13,14 +15,14 @@ MEMORY { SECTIONS { . = ARM_EL3_TZC_DRAM1_BASE; - ASSERT(. == ALIGN(4096), + ASSERT(. == ALIGN(PAGE_SIZE), "ARM_EL3_TZC_DRAM_BASE address is not aligned on a page boundary.") - el3_tzc_dram (NOLOAD) : ALIGN(4096) { + el3_tzc_dram (NOLOAD) : ALIGN(PAGE_SIZE) { __EL3_SEC_DRAM_START__ = .; *(arm_el3_tzc_dram) __EL3_SEC_DRAM_UNALIGNED_END__ = .; - . = NEXT(4096); + . = NEXT(PAGE_SIZE); __EL3_SEC_DRAM_END__ = .; } >EL3_SEC_DRAM } |