Skip to content

GitLab

Unverified Commit 57b1c0d7 authored by davidcunado-arm's avatar davidcunado-arm Committed by GitHub
Browse files

Merge pull request #1174 from antonio-nino-diaz-arm/an/page-size 

Replace magic numbers in linkerscripts by PAGE_SIZE
parents 64b978fb a2aedac2
Hide whitespace changes
Inline Side-by-side
bl1/bl1.ld.S
View file @ 57b1c0d7
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
*/ */
#include <platform_def.h> #include <platform_def.h>
#include <xlat_tables_defs.h>
OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
OUTPUT_ARCH(PLATFORM_LINKER_ARCH) OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
...@@ -18,7 +19,7 @@ MEMORY { ...@@ -18,7 +19,7 @@ MEMORY {
SECTIONS SECTIONS
{ {
. = BL1_RO_BASE; . = BL1_RO_BASE;
ASSERT(. == ALIGN(4096), ASSERT(. == ALIGN(PAGE_SIZE),
"BL1_RO_BASE address is not aligned on a page boundary.") "BL1_RO_BASE address is not aligned on a page boundary.")
#if SEPARATE_CODE_AND_RODATA #if SEPARATE_CODE_AND_RODATA
...@@ -27,7 +28,7 @@ SECTIONS ...@@ -27,7 +28,7 @@ SECTIONS
*bl1_entrypoint.o(.text*) *bl1_entrypoint.o(.text*)
*(.text*) *(.text*)
*(.vectors) *(.vectors)
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__TEXT_END__ = .; __TEXT_END__ = .;
} >ROM } >ROM
...@@ -88,7 +89,7 @@ SECTIONS ...@@ -88,7 +89,7 @@ SECTIONS
"cpu_ops not defined for this platform.") "cpu_ops not defined for this platform.")
. = BL1_RW_BASE; . = BL1_RW_BASE;
ASSERT(BL1_RW_BASE == ALIGN(4096), ASSERT(BL1_RW_BASE == ALIGN(PAGE_SIZE),
"BL1_RW_BASE address is not aligned on a page boundary.") "BL1_RW_BASE address is not aligned on a page boundary.")
/* /*
...@@ -141,7 +142,7 @@ SECTIONS ...@@ -141,7 +142,7 @@ SECTIONS
* are not mixed with normal data. This is required to set up the correct * are not mixed with normal data. This is required to set up the correct
* memory attributes for the coherent data page tables. * memory attributes for the coherent data page tables.
*/ */
coherent_ram (NOLOAD) : ALIGN(4096) { coherent_ram (NOLOAD) : ALIGN(PAGE_SIZE) {
__COHERENT_RAM_START__ = .; __COHERENT_RAM_START__ = .;
*(tzfw_coherent_mem) *(tzfw_coherent_mem)
__COHERENT_RAM_END_UNALIGNED__ = .; __COHERENT_RAM_END_UNALIGNED__ = .;
...@@ -150,7 +151,7 @@ SECTIONS ...@@ -150,7 +151,7 @@ SECTIONS
* as device memory. No other unexpected data must creep in. * as device memory. No other unexpected data must creep in.
* Ensure the rest of the current memory page is unused. * Ensure the rest of the current memory page is unused.
*/ */
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__COHERENT_RAM_END__ = .; __COHERENT_RAM_END__ = .;
} >RAM } >RAM
#endif #endif
......
bl2/bl2.ld.S
View file @ 57b1c0d7
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
*/ */
#include <platform_def.h> #include <platform_def.h>
#include <xlat_tables_defs.h>
OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
OUTPUT_ARCH(PLATFORM_LINKER_ARCH) OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
...@@ -18,7 +19,7 @@ MEMORY { ...@@ -18,7 +19,7 @@ MEMORY {
SECTIONS SECTIONS
{ {
. = BL2_BASE; . = BL2_BASE;
ASSERT(. == ALIGN(4096), ASSERT(. == ALIGN(PAGE_SIZE),
"BL2_BASE address is not aligned on a page boundary.") "BL2_BASE address is not aligned on a page boundary.")
#if SEPARATE_CODE_AND_RODATA #if SEPARATE_CODE_AND_RODATA
...@@ -27,7 +28,7 @@ SECTIONS ...@@ -27,7 +28,7 @@ SECTIONS
*bl2_entrypoint.o(.text*) *bl2_entrypoint.o(.text*)
*(.text*) *(.text*)
*(.vectors) *(.vectors)
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__TEXT_END__ = .; __TEXT_END__ = .;
} >RAM } >RAM
...@@ -41,7 +42,7 @@ SECTIONS ...@@ -41,7 +42,7 @@ SECTIONS
KEEP(*(.img_parser_lib_descs)) KEEP(*(.img_parser_lib_descs))
__PARSER_LIB_DESCS_END__ = .; __PARSER_LIB_DESCS_END__ = .;
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__RODATA_END__ = .; __RODATA_END__ = .;
} >RAM } >RAM
#else #else
...@@ -64,7 +65,7 @@ SECTIONS ...@@ -64,7 +65,7 @@ SECTIONS
* read-only, executable. No RW data from the next section must * read-only, executable. No RW data from the next section must
* creep in. Ensure the rest of the current memory page is unused. * creep in. Ensure the rest of the current memory page is unused.
*/ */
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__RO_END__ = .; __RO_END__ = .;
} >RAM } >RAM
#endif #endif
...@@ -120,7 +121,7 @@ SECTIONS ...@@ -120,7 +121,7 @@ SECTIONS
* are not mixed with normal data. This is required to set up the correct * are not mixed with normal data. This is required to set up the correct
* memory attributes for the coherent data page tables. * memory attributes for the coherent data page tables.
*/ */
coherent_ram (NOLOAD) : ALIGN(4096) { coherent_ram (NOLOAD) : ALIGN(PAGE_SIZE) {
__COHERENT_RAM_START__ = .; __COHERENT_RAM_START__ = .;
*(tzfw_coherent_mem) *(tzfw_coherent_mem)
__COHERENT_RAM_END_UNALIGNED__ = .; __COHERENT_RAM_END_UNALIGNED__ = .;
...@@ -129,7 +130,7 @@ SECTIONS ...@@ -129,7 +130,7 @@ SECTIONS
* as device memory. No other unexpected data must creep in. * as device memory. No other unexpected data must creep in.
* Ensure the rest of the current memory page is unused. * Ensure the rest of the current memory page is unused.
*/ */
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__COHERENT_RAM_END__ = .; __COHERENT_RAM_END__ = .;
} >RAM } >RAM
#endif #endif
......
bl2u/bl2u.ld.S
View file @ 57b1c0d7
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
*/ */
#include <platform_def.h> #include <platform_def.h>
#include <xlat_tables_defs.h>
OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
OUTPUT_ARCH(PLATFORM_LINKER_ARCH) OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
...@@ -18,7 +19,7 @@ MEMORY { ...@@ -18,7 +19,7 @@ MEMORY {
SECTIONS SECTIONS
{ {
. = BL2U_BASE; . = BL2U_BASE;
ASSERT(. == ALIGN(4096), ASSERT(. == ALIGN(PAGE_SIZE),
"BL2U_BASE address is not aligned on a page boundary.") "BL2U_BASE address is not aligned on a page boundary.")
#if SEPARATE_CODE_AND_RODATA #if SEPARATE_CODE_AND_RODATA
...@@ -27,14 +28,14 @@ SECTIONS ...@@ -27,14 +28,14 @@ SECTIONS
*bl2u_entrypoint.o(.text*) *bl2u_entrypoint.o(.text*)
*(.text*) *(.text*)
*(.vectors) *(.vectors)
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__TEXT_END__ = .; __TEXT_END__ = .;
} >RAM } >RAM
.rodata . : { .rodata . : {
__RODATA_START__ = .; __RODATA_START__ = .;
*(.rodata*) *(.rodata*)
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__RODATA_END__ = .; __RODATA_END__ = .;
} >RAM } >RAM
#else #else
...@@ -51,7 +52,7 @@ SECTIONS ...@@ -51,7 +52,7 @@ SECTIONS
* read-only, executable. No RW data from the next section must * read-only, executable. No RW data from the next section must
* creep in. Ensure the rest of the current memory page is unused. * creep in. Ensure the rest of the current memory page is unused.
*/ */
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__RO_END__ = .; __RO_END__ = .;
} >RAM } >RAM
#endif #endif
...@@ -107,7 +108,7 @@ SECTIONS ...@@ -107,7 +108,7 @@ SECTIONS
* are not mixed with normal data. This is required to set up the correct * are not mixed with normal data. This is required to set up the correct
* memory attributes for the coherent data page tables. * memory attributes for the coherent data page tables.
*/ */
coherent_ram (NOLOAD) : ALIGN(4096) { coherent_ram (NOLOAD) : ALIGN(PAGE_SIZE) {
__COHERENT_RAM_START__ = .; __COHERENT_RAM_START__ = .;
*(tzfw_coherent_mem) *(tzfw_coherent_mem)
__COHERENT_RAM_END_UNALIGNED__ = .; __COHERENT_RAM_END_UNALIGNED__ = .;
...@@ -116,7 +117,7 @@ SECTIONS ...@@ -116,7 +117,7 @@ SECTIONS
* as device memory. No other unexpected data must creep in. * as device memory. No other unexpected data must creep in.
* Ensure the rest of the current memory page is unused. * Ensure the rest of the current memory page is unused.
*/ */
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__COHERENT_RAM_END__ = .; __COHERENT_RAM_END__ = .;
} >RAM } >RAM
#endif #endif
......
bl31/bl31.ld.S
View file @ 57b1c0d7
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
*/ */
#include <platform_def.h> #include <platform_def.h>
#include <xlat_tables_defs.h>
OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
OUTPUT_ARCH(PLATFORM_LINKER_ARCH) OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
...@@ -22,7 +23,7 @@ MEMORY { ...@@ -22,7 +23,7 @@ MEMORY {
SECTIONS SECTIONS
{ {
. = BL31_BASE; . = BL31_BASE;
ASSERT(. == ALIGN(4096), ASSERT(. == ALIGN(PAGE_SIZE),
"BL31_BASE address is not aligned on a page boundary.") "BL31_BASE address is not aligned on a page boundary.")
#if SEPARATE_CODE_AND_RODATA #if SEPARATE_CODE_AND_RODATA
...@@ -31,7 +32,7 @@ SECTIONS ...@@ -31,7 +32,7 @@ SECTIONS
*bl31_entrypoint.o(.text*) *bl31_entrypoint.o(.text*)
*(.text*) *(.text*)
*(.vectors) *(.vectors)
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__TEXT_END__ = .; __TEXT_END__ = .;
} >RAM } >RAM
...@@ -66,7 +67,7 @@ SECTIONS ...@@ -66,7 +67,7 @@ SECTIONS
. = ALIGN(8); . = ALIGN(8);
#include <pubsub_events.h> #include <pubsub_events.h>
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__RODATA_END__ = .; __RODATA_END__ = .;
} >RAM } >RAM
#else #else
...@@ -110,7 +111,7 @@ SECTIONS ...@@ -110,7 +111,7 @@ SECTIONS
* executable. No RW data from the next section must creep in. * executable. No RW data from the next section must creep in.
* Ensure the rest of the current memory page is unused. * Ensure the rest of the current memory page is unused.
*/ */
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__RO_END__ = .; __RO_END__ = .;
} >RAM } >RAM
#endif #endif
...@@ -127,10 +128,10 @@ SECTIONS ...@@ -127,10 +128,10 @@ SECTIONS
* There's no need to include this into the RO section of BL31 because it * There's no need to include this into the RO section of BL31 because it
* doesn't need to be accessed by BL31. * doesn't need to be accessed by BL31.
*/ */
spm_shim_exceptions : ALIGN(4096) { spm_shim_exceptions : ALIGN(PAGE_SIZE) {
__SPM_SHIM_EXCEPTIONS_START__ = .; __SPM_SHIM_EXCEPTIONS_START__ = .;
*(.spm_shim_exceptions) *(.spm_shim_exceptions)
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__SPM_SHIM_EXCEPTIONS_END__ = .; __SPM_SHIM_EXCEPTIONS_END__ = .;
} >RAM } >RAM
#endif #endif
...@@ -223,7 +224,7 @@ SECTIONS ...@@ -223,7 +224,7 @@ SECTIONS
__SP_IMAGE_XLAT_TABLES_START__ = .; __SP_IMAGE_XLAT_TABLES_START__ = .;
*secure_partition*.o(xlat_table) *secure_partition*.o(xlat_table)
/* Make sure that the rest of the page is empty. */ /* Make sure that the rest of the page is empty. */
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__SP_IMAGE_XLAT_TABLES_END__ = .; __SP_IMAGE_XLAT_TABLES_END__ = .;
#endif #endif
*(xlat_table) *(xlat_table)
...@@ -236,7 +237,7 @@ SECTIONS ...@@ -236,7 +237,7 @@ SECTIONS
* are not mixed with normal data. This is required to set up the correct * are not mixed with normal data. This is required to set up the correct
* memory attributes for the coherent data page tables. * memory attributes for the coherent data page tables.
*/ */
coherent_ram (NOLOAD) : ALIGN(4096) { coherent_ram (NOLOAD) : ALIGN(PAGE_SIZE) {
__COHERENT_RAM_START__ = .; __COHERENT_RAM_START__ = .;
/* /*
* Bakery locks are stored in coherent memory * Bakery locks are stored in coherent memory
...@@ -251,7 +252,7 @@ SECTIONS ...@@ -251,7 +252,7 @@ SECTIONS
* as device memory. No other unexpected data must creep in. * as device memory. No other unexpected data must creep in.
* Ensure the rest of the current memory page is unused. * Ensure the rest of the current memory page is unused.
*/ */
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__COHERENT_RAM_END__ = .; __COHERENT_RAM_END__ = .;
} >RAM } >RAM
#endif #endif
......
bl32/sp_min/sp_min.ld.S
View file @ 57b1c0d7
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
*/ */
#include <platform_def.h> #include <platform_def.h>
#include <xlat_tables_defs.h>
OUTPUT_FORMAT(elf32-littlearm) OUTPUT_FORMAT(elf32-littlearm)
OUTPUT_ARCH(arm) OUTPUT_ARCH(arm)
...@@ -18,7 +19,7 @@ MEMORY { ...@@ -18,7 +19,7 @@ MEMORY {
SECTIONS SECTIONS
{ {
. = BL32_BASE; . = BL32_BASE;
ASSERT(. == ALIGN(4096), ASSERT(. == ALIGN(PAGE_SIZE),
"BL32_BASE address is not aligned on a page boundary.") "BL32_BASE address is not aligned on a page boundary.")
#if SEPARATE_CODE_AND_RODATA #if SEPARATE_CODE_AND_RODATA
...@@ -27,7 +28,7 @@ SECTIONS ...@@ -27,7 +28,7 @@ SECTIONS
*entrypoint.o(.text*) *entrypoint.o(.text*)
*(.text*) *(.text*)
*(.vectors) *(.vectors)
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__TEXT_END__ = .; __TEXT_END__ = .;
} >RAM } >RAM
...@@ -54,7 +55,7 @@ SECTIONS ...@@ -54,7 +55,7 @@ SECTIONS
. = ALIGN(8); . = ALIGN(8);
#include <pubsub_events.h> #include <pubsub_events.h>
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__RODATA_END__ = .; __RODATA_END__ = .;
} >RAM } >RAM
#else #else
...@@ -91,7 +92,7 @@ SECTIONS ...@@ -91,7 +92,7 @@ SECTIONS
* read-only, executable. No RW data from the next section must * 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 block is unused.
*/ */
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__RO_END__ = .; __RO_END__ = .;
} >RAM } >RAM
#endif #endif
...@@ -190,7 +191,7 @@ SECTIONS ...@@ -190,7 +191,7 @@ SECTIONS
* are not mixed with normal data. This is required to set up the correct * are not mixed with normal data. This is required to set up the correct
* memory attributes for the coherent data page tables. * memory attributes for the coherent data page tables.
*/ */
coherent_ram (NOLOAD) : ALIGN(4096) { coherent_ram (NOLOAD) : ALIGN(PAGE_SIZE) {
__COHERENT_RAM_START__ = .; __COHERENT_RAM_START__ = .;
/* /*
* Bakery locks are stored in coherent memory * Bakery locks are stored in coherent memory
...@@ -205,7 +206,7 @@ SECTIONS ...@@ -205,7 +206,7 @@ SECTIONS
* as device memory. No other unexpected data must creep in. * as device memory. No other unexpected data must creep in.
* Ensure the rest of the current memory page is unused. * Ensure the rest of the current memory page is unused.
*/ */
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__COHERENT_RAM_END__ = .; __COHERENT_RAM_END__ = .;
} >RAM } >RAM
......
bl32/tsp/tsp.ld.S
View file @ 57b1c0d7
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
*/ */
#include <platform_def.h> #include <platform_def.h>
#include <xlat_tables_defs.h>
OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
OUTPUT_ARCH(PLATFORM_LINKER_ARCH) OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
...@@ -19,7 +20,7 @@ MEMORY { ...@@ -19,7 +20,7 @@ MEMORY {
SECTIONS SECTIONS
{ {
. = BL32_BASE; . = BL32_BASE;
ASSERT(. == ALIGN(4096), ASSERT(. == ALIGN(PAGE_SIZE),
"BL32_BASE address is not aligned on a page boundary.") "BL32_BASE address is not aligned on a page boundary.")
#if SEPARATE_CODE_AND_RODATA #if SEPARATE_CODE_AND_RODATA
...@@ -28,14 +29,14 @@ SECTIONS ...@@ -28,14 +29,14 @@ SECTIONS
*tsp_entrypoint.o(.text*) *tsp_entrypoint.o(.text*)
*(.text*) *(.text*)
*(.vectors) *(.vectors)
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__TEXT_END__ = .; __TEXT_END__ = .;
} >RAM } >RAM
.rodata . : { .rodata . : {
__RODATA_START__ = .; __RODATA_START__ = .;
*(.rodata*) *(.rodata*)
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__RODATA_END__ = .; __RODATA_END__ = .;
} >RAM } >RAM
#else #else
...@@ -51,7 +52,7 @@ SECTIONS ...@@ -51,7 +52,7 @@ SECTIONS
* read-only, executable. No RW data from the next section must * read-only, executable. No RW data from the next section must
* creep in. Ensure the rest of the current memory page is unused. * creep in. Ensure the rest of the current memory page is unused.
*/ */
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__RO_END__ = .; __RO_END__ = .;
} >RAM } >RAM
#endif #endif
...@@ -106,7 +107,7 @@ SECTIONS ...@@ -106,7 +107,7 @@ SECTIONS
* are not mixed with normal data. This is required to set up the correct * are not mixed with normal data. This is required to set up the correct
* memory attributes for the coherent data page tables. * memory attributes for the coherent data page tables.
*/ */
coherent_ram (NOLOAD) : ALIGN(4096) { coherent_ram (NOLOAD) : ALIGN(PAGE_SIZE) {
__COHERENT_RAM_START__ = .; __COHERENT_RAM_START__ = .;
*(tzfw_coherent_mem) *(tzfw_coherent_mem)
__COHERENT_RAM_END_UNALIGNED__ = .; __COHERENT_RAM_END_UNALIGNED__ = .;
...@@ -115,7 +116,7 @@ SECTIONS ...@@ -115,7 +116,7 @@ SECTIONS
* as device memory. No other unexpected data must creep in. * as device memory. No other unexpected data must creep in.
* Ensure the rest of the current memory page is unused. * Ensure the rest of the current memory page is unused.
*/ */
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__COHERENT_RAM_END__ = .; __COHERENT_RAM_END__ = .;
} >RAM } >RAM
#endif #endif
......
include/plat/arm/common/arm_common.ld.S
View file @ 57b1c0d7
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#ifndef __ARM_COMMON_LD_S__ #ifndef __ARM_COMMON_LD_S__
#define __ARM_COMMON_LD_S__ #define __ARM_COMMON_LD_S__
#include <xlat_tables_defs.h>
MEMORY { MEMORY {
EL3_SEC_DRAM (rw): ORIGIN = ARM_EL3_TZC_DRAM1_BASE, LENGTH = ARM_EL3_TZC_DRAM1_SIZE EL3_SEC_DRAM (rw): ORIGIN = ARM_EL3_TZC_DRAM1_BASE, LENGTH = ARM_EL3_TZC_DRAM1_SIZE
} }
...@@ -13,14 +15,14 @@ MEMORY { ...@@ -13,14 +15,14 @@ MEMORY {
SECTIONS SECTIONS
{ {
. = ARM_EL3_TZC_DRAM1_BASE; . = 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.") "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__ = .; __EL3_SEC_DRAM_START__ = .;
*(arm_el3_tzc_dram) *(arm_el3_tzc_dram)
__EL3_SEC_DRAM_UNALIGNED_END__ = .; __EL3_SEC_DRAM_UNALIGNED_END__ = .;
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__EL3_SEC_DRAM_END__ = .; __EL3_SEC_DRAM_END__ = .;
} >EL3_SEC_DRAM } >EL3_SEC_DRAM
} }
......
plat/mediatek/mt6795/bl31.ld.S
View file @ 57b1c0d7
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
*/ */
#include <platform_def.h> #include <platform_def.h>
#include <xlat_tables_defs.h>
OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
OUTPUT_ARCH(PLATFORM_LINKER_ARCH) OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
...@@ -29,7 +30,7 @@ SECTIONS ...@@ -29,7 +30,7 @@ SECTIONS
*(.vectors) *(.vectors)
} >RAM } >RAM
ASSERT(. == ALIGN(4096), ASSERT(. == ALIGN(PAGE_SIZE),
"BL31_BASE address is not aligned on a page boundary.") "BL31_BASE address is not aligned on a page boundary.")
ro . : { ro . : {
...@@ -58,7 +59,7 @@ SECTIONS ...@@ -58,7 +59,7 @@ SECTIONS
* executable. No RW data from the next section must creep in. * executable. No RW data from the next section must creep in.
* Ensure the rest of the current memory page is unused. * Ensure the rest of the current memory page is unused.
*/ */
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__RO_END__ = .; __RO_END__ = .;
} >RAM } >RAM
...@@ -144,7 +145,7 @@ SECTIONS ...@@ -144,7 +145,7 @@ SECTIONS
* are not mixed with normal data. This is required to set up the correct * are not mixed with normal data. This is required to set up the correct
* memory attributes for the coherent data page tables. * memory attributes for the coherent data page tables.
*/ */
coherent_ram (NOLOAD) : ALIGN(4096) { coherent_ram (NOLOAD) : ALIGN(PAGE_SIZE) {
__COHERENT_RAM_START__ = .; __COHERENT_RAM_START__ = .;
/* /*
* Bakery locks are stored in coherent memory * Bakery locks are stored in coherent memory
...@@ -159,7 +160,7 @@ SECTIONS ...@@ -159,7 +160,7 @@ SECTIONS
* as device memory. No other unexpected data must creep in. * as device memory. No other unexpected data must creep in.
* Ensure the rest of the current memory page is unused. * Ensure the rest of the current memory page is unused.
*/ */
. = NEXT(4096); . = NEXT(PAGE_SIZE);
__COHERENT_RAM_END__ = .; __COHERENT_RAM_END__ = .;
} >RAM2 } >RAM2
#endif #endif
......
plat/rockchip/rk3399/include/plat.ld.S
View file @ 57b1c0d7
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#ifndef __ROCKCHIP_PLAT_LD_S__ #ifndef __ROCKCHIP_PLAT_LD_S__
#define __ROCKCHIP_PLAT_LD_S__ #define __ROCKCHIP_PLAT_LD_S__
#include <xlat_tables_defs.h>
MEMORY { MEMORY {
SRAM (rwx): ORIGIN = SRAM_BASE, LENGTH = SRAM_SIZE SRAM (rwx): ORIGIN = SRAM_BASE, LENGTH = SRAM_SIZE
PMUSRAM (rwx): ORIGIN = PMUSRAM_BASE, LENGTH = PMUSRAM_RSIZE PMUSRAM (rwx): ORIGIN = PMUSRAM_BASE, LENGTH = PMUSRAM_RSIZE
...@@ -14,7 +16,7 @@ MEMORY { ...@@ -14,7 +16,7 @@ MEMORY {
SECTIONS SECTIONS
{ {
. = SRAM_BASE; . = SRAM_BASE;
ASSERT(. == ALIGN(4096), ASSERT(. == ALIGN(PAGE_SIZE),
"SRAM_BASE address is not aligned on a page boundary.") "SRAM_BASE address is not aligned on a page boundary.")
/* /*
...@@ -27,40 +29,40 @@ SECTIONS ...@@ -27,40 +29,40 @@ SECTIONS
* | sram data * | sram data
* ---------------- * ----------------
*/ */
.incbin_sram : ALIGN(4096) { .incbin_sram : ALIGN(PAGE_SIZE) {
__sram_incbin_start = .; __sram_incbin_start = .;
*(.sram.incbin) *(.sram.incbin)
__sram_incbin_real_end = .; __sram_incbin_real_end = .;
. = ALIGN(4096); . = ALIGN(PAGE_SIZE);
__sram_incbin_end = .; __sram_incbin_end = .;
} >SRAM } >SRAM
ASSERT((__sram_incbin_real_end - __sram_incbin_start) <= ASSERT((__sram_incbin_real_end - __sram_incbin_start) <=
SRAM_BIN_LIMIT, ".incbin_sram has exceeded its limit") SRAM_BIN_LIMIT, ".incbin_sram has exceeded its limit")
.text_sram : ALIGN(4096) { .text_sram : ALIGN(PAGE_SIZE) {
__bl31_sram_text_start = .; __bl31_sram_text_start = .;
*(.sram.text) *(.sram.text)
*(.sram.rodata) *(.sram.rodata)
__bl31_sram_text_real_end = .; __bl31_sram_text_real_end = .;
. = ALIGN(4096); . = ALIGN(PAGE_SIZE);
__bl31_sram_text_end = .; __bl31_sram_text_end = .;
} >SRAM } >SRAM
ASSERT((__bl31_sram_text_real_end - __bl31_sram_text_start) <= ASSERT((__bl31_sram_text_real_end - __bl31_sram_text_start) <=
SRAM_TEXT_LIMIT, ".text_sram has exceeded its limit") SRAM_TEXT_LIMIT, ".text_sram has exceeded its limit")
.data_sram : ALIGN(4096) { .data_sram : ALIGN(PAGE_SIZE) {
__bl31_sram_data_start = .; __bl31_sram_data_start = .;
*(.sram.data) *(.sram.data)
__bl31_sram_data_real_end = .; __bl31_sram_data_real_end = .;
. = ALIGN(4096); . = ALIGN(PAGE_SIZE);
__bl31_sram_data_end = .; __bl31_sram_data_end = .;
} >SRAM } >SRAM
ASSERT((__bl31_sram_data_real_end - __bl31_sram_data_start) <= ASSERT((__bl31_sram_data_real_end - __bl31_sram_data_start) <=
SRAM_DATA_LIMIT, ".data_sram has exceeded its limit") SRAM_DATA_LIMIT, ".data_sram has exceeded its limit")
.stack_sram : ALIGN(4096) { .stack_sram : ALIGN(PAGE_SIZE) {
__bl31_sram_stack_start = .; __bl31_sram_stack_start = .;
. += 4096; . += PAGE_SIZE;
__bl31_sram_stack_end = .; __bl31_sram_stack_end = .;
} >SRAM } >SRAM
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment