diff options
| -rw-r--r-- | bl1/bl1.ld.S | 8 | ||||
| -rw-r--r-- | bl2/bl2.ld.S | 2 | ||||
| -rw-r--r-- | bl31/bl31.ld.S | 2 | ||||
| -rw-r--r-- | bl32/tsp/tsp.ld.S | 2 | ||||
| -rw-r--r-- | plat/fvp/platform.h | 10 |
5 files changed, 20 insertions, 4 deletions
diff --git a/bl1/bl1.ld.S b/bl1/bl1.ld.S index 11b9a8f0..1af2a32d 100644 --- a/bl1/bl1.ld.S +++ b/bl1/bl1.ld.S @@ -118,11 +118,17 @@ SECTIONS __DATA_ROM_START__ = LOADADDR(.data); __DATA_SIZE__ = SIZEOF(.data); + /* + * The .data section is the last PROGBITS section so its end marks the end + * of the read-only part of BL1's binary. + */ + ASSERT(__DATA_ROM_START__ + __DATA_SIZE__ <= BL1_RO_LIMIT, + "BL1's RO section has exceeded its limit.") __BSS_SIZE__ = SIZEOF(.bss); __COHERENT_RAM_UNALIGNED_SIZE__ = __COHERENT_RAM_END_UNALIGNED__ - __COHERENT_RAM_START__; - ASSERT(. <= BL31_BASE, "BL1 image overlaps BL31 image.") + ASSERT(. <= BL1_RW_LIMIT, "BL1's RW section has exceeded its limit.") } diff --git a/bl2/bl2.ld.S b/bl2/bl2.ld.S index edb676af..9f02e92c 100644 --- a/bl2/bl2.ld.S +++ b/bl2/bl2.ld.S @@ -117,4 +117,6 @@ SECTIONS __BSS_SIZE__ = SIZEOF(.bss); __COHERENT_RAM_UNALIGNED_SIZE__ = __COHERENT_RAM_END_UNALIGNED__ - __COHERENT_RAM_START__; + + ASSERT(. <= BL2_LIMIT, "BL2 image has exceeded its limit.") } diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S index 1b818f5e..068d3181 100644 --- a/bl31/bl31.ld.S +++ b/bl31/bl31.ld.S @@ -126,5 +126,5 @@ SECTIONS __COHERENT_RAM_UNALIGNED_SIZE__ = __COHERENT_RAM_END_UNALIGNED__ - __COHERENT_RAM_START__; - ASSERT(. <= BL2_BASE, "BL31 image overlaps BL2 image.") + ASSERT(. <= BL31_LIMIT, "BL3-1 image has exceeded its limit.") } diff --git a/bl32/tsp/tsp.ld.S b/bl32/tsp/tsp.ld.S index 559ae3d3..c72fefbd 100644 --- a/bl32/tsp/tsp.ld.S +++ b/bl32/tsp/tsp.ld.S @@ -119,5 +119,5 @@ SECTIONS __COHERENT_RAM_UNALIGNED_SIZE__ = __COHERENT_RAM_END_UNALIGNED__ - __COHERENT_RAM_START__; - ASSERT(. <= BL32_LIMIT, "BL3-2 image does not fit.") + ASSERT(. <= BL32_LIMIT, "BL3-2 image has exceeded its limit.") } diff --git a/plat/fvp/platform.h b/plat/fvp/platform.h index ff87cf80..7fdbf81c 100644 --- a/plat/fvp/platform.h +++ b/plat/fvp/platform.h @@ -237,21 +237,29 @@ /******************************************************************************* * BL1 specific defines. - * BL1 RW data is relocated from ROM to RAM at runtime so we need 2 base + * BL1 RW data is relocated from ROM to RAM at runtime so we need 2 sets of * addresses. ******************************************************************************/ #define BL1_RO_BASE TZROM_BASE +#define BL1_RO_LIMIT (TZROM_BASE + TZROM_SIZE) #define BL1_RW_BASE TZRAM_BASE +#define BL1_RW_LIMIT BL31_BASE /******************************************************************************* * BL2 specific defines. ******************************************************************************/ #define BL2_BASE (TZRAM_BASE + TZRAM_SIZE - 0xc000) +#define BL2_LIMIT (TZRAM_BASE + TZRAM_SIZE) /******************************************************************************* * BL31 specific defines. ******************************************************************************/ #define BL31_BASE (TZRAM_BASE + 0x6000) +#if TSP_RAM_LOCATION_ID == TSP_IN_TZRAM +#define BL31_LIMIT BL32_BASE +#elif TSP_RAM_LOCATION_ID == TSP_IN_TZDRAM +#define BL31_LIMIT BL2_BASE +#endif /******************************************************************************* * BL32 specific defines. |