From: Sandrine Bailleux <sandrine.bailleux@arm.com>
Date: Thu, 22 May 2014 14:21:35 +0000 (+0100)
Subject: Make BL1 RO and RW base addresses configurable
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4f59d8359f97e031c212032afeb57124ac4fcd94;p=project%2Fbcm63xx%2Fatf.git

Make BL1 RO and RW base addresses configurable

BL1 RO and RW base address used to be fixed, respectively to the first
address of the Trusted ROM and the first address of the Trusted RAM.

Introduce new platform defines to configure the BL1 RO and RW base
addresses.

Change-Id: If26616513a47798593a4bb845a4b0fb37c867cd6
---

diff --git a/bl1/bl1.ld.S b/bl1/bl1.ld.S
index 81c54435..11b9a8f0 100644
--- a/bl1/bl1.ld.S
+++ b/bl1/bl1.ld.S
@@ -41,7 +41,11 @@ MEMORY {
 
 SECTIONS
 {
-    ro : {
+    . = BL1_RO_BASE;
+    ASSERT(. == ALIGN(4096),
+           "BL1_RO_BASE address is not aligned on a page boundary.")
+
+    ro . : {
         __RO_START__ = .;
         *bl1_entrypoint.o(.text*)
         *(.text*)
@@ -52,16 +56,19 @@ SECTIONS
 
     /*
      * The .data section gets copied from ROM to RAM at runtime.
-     * Its LMA and VMA must be 16-byte aligned.
+     * Its LMA must be 16-byte aligned.
+     * Its VMA must be page-aligned as it marks the first read/write page.
      */
-    . = NEXT(16);        /* Align LMA */
-    .data : ALIGN(16) {  /* Align VMA */
+    . = BL1_RW_BASE;
+    ASSERT(. == ALIGN(4096),
+           "BL1_RW_BASE address is not aligned on a page boundary.")
+    .data . : ALIGN(16) {
         __DATA_RAM_START__ = .;
         *(.data*)
         __DATA_RAM_END__ = .;
     } >RAM AT>ROM
 
-    stacks (NOLOAD) : {
+    stacks . (NOLOAD) : {
         __STACKS_START__ = .;
         *(tzfw_normal_stacks)
         __STACKS_END__ = .;
diff --git a/plat/fvp/platform.h b/plat/fvp/platform.h
index 981bc98a..ff87cf80 100644
--- a/plat/fvp/platform.h
+++ b/plat/fvp/platform.h
@@ -235,6 +235,14 @@
 #define PLAT_AFF1_SUSPEND	0x2
 #define PLAT_AFF1_ON		0x3
 
+/*******************************************************************************
+ * BL1 specific defines.
+ * BL1 RW data is relocated from ROM to RAM at runtime so we need 2 base
+ * addresses.
+ ******************************************************************************/
+#define BL1_RO_BASE			TZROM_BASE
+#define BL1_RW_BASE			TZRAM_BASE
+
 /*******************************************************************************
  * BL2 specific defines.
  ******************************************************************************/