From 637ebd2eb9a40847fcd93a0ae3643aba6462c561 Mon Sep 17 00:00:00 2001 From: Juan Castillo Date: Tue, 12 Aug 2014 13:04:43 +0100 Subject: FVP: apply new naming conventions to memory regions Secure ROM at address 0x0000_0000 is defined as FVP_TRUSTED_ROM Secure RAM at address 0x0400_0000 is defined as FVP_TRUSTED_SRAM Secure RAM at address 0x0600_0000 is defined as FVP_TRUSTED_DRAM BLn_BASE and BLn_LIMIT definitions have been updated and are based on these new memory regions. The available memory for each bootloader in the linker script is defined by BLn_BASE and BLn_LIMIT, instead of the complete memory region. TZROM_BASE/SIZE and TZRAM_BASE/SIZE are no longer required as part of the platform porting. FVP common definitions are defined in fvp_def.h while platform_def.h contains exclusively (with a few exceptions) the definitions that are mandatory in the porting guide. Therefore, platform_def.h now includes fvp_def.h instead of the other way around. Porting guide has been updated to reflect these changes. Change-Id: I39a6088eb611fc4a347db0db4b8f1f0417dbab05 --- bl1/bl1.ld.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bl1') diff --git a/bl1/bl1.ld.S b/bl1/bl1.ld.S index 967ba328c..0ca4a6309 100644 --- a/bl1/bl1.ld.S +++ b/bl1/bl1.ld.S @@ -35,8 +35,8 @@ OUTPUT_ARCH(PLATFORM_LINKER_ARCH) ENTRY(bl1_entrypoint) MEMORY { - ROM (rx): ORIGIN = TZROM_BASE, LENGTH = TZROM_SIZE - RAM (rwx): ORIGIN = TZRAM_BASE, LENGTH = TZRAM_SIZE + ROM (rx): ORIGIN = BL1_RO_BASE, LENGTH = BL1_RO_LIMIT + RAM (rwx): ORIGIN = BL1_RW_BASE, LENGTH = BL1_RW_LIMIT } SECTIONS -- cgit v1.2.3