[coreboot-gerrit] Patch set updated for coreboot: urara: Increase bootblock size

[Julius Werner (jwerner@chromium.org)]

Julius Werner (jwerner at chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13733

-gerrit

commit 843384879c736ec63b219007ec9d74f447c245b0
Author: Julius Werner <jwerner at chromium.org>
Date:   Thu Feb 18 12:56:26 2016 -0800

    urara: Increase bootblock size
    
    The urara bootblock is less than a kilobyte from its limit (20K).
    There's more than enough space available so increase it to avoid
    impeding changes to core code.
    
    Also add some more automated checks to better model the platform's
    multiple windows into the same memory region and guard against
    accidental overlaps by a seemingly benign change to one window.
    
    Change-Id: I2e535b56d5d1748830ea1e70fd12fd9e87009bce
    Signed-off-by: Julius Werner <jwerner at chromium.org>
---
 src/soc/imgtec/pistachio/include/soc/memlayout.ld | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/soc/imgtec/pistachio/include/soc/memlayout.ld b/src/soc/imgtec/pistachio/include/soc/memlayout.ld
index a9800a5..9891bae 100644
--- a/src/soc/imgtec/pistachio/include/soc/memlayout.ld
+++ b/src/soc/imgtec/pistachio/include/soc/memlayout.ld
@@ -17,6 +17,13 @@
 
 #include <arch/header.ld>
 
+/* SRAM memory is mapped in two different locations. Define regions in both for
+ * full overlap checking and use this to guarantee they're kept in sync. */
+#define ASSERT_MIRRORED(r1, r2) \
+	_ = ASSERT(_e##r1 - _##r1 == _e##r2 - _##r2 && \
+		   _##r1 & 0x7fffffff == _##r2 & 0x7fffffff, \
+		   STR(r1 and r2 do not match!));
+
 SECTIONS
 {
 	/*
@@ -36,16 +43,18 @@ SECTIONS
 	 * and then through the identity mapping in ROM stage.
 	 */
 	SRAM_START(0x1a000000)
-	ROMSTAGE(0x1a005000, 60K)
-	VBOOT2_WORK(0x1a014000, 12K)
-	PRERAM_CBFS_CACHE(0x1a017000, 56K)
+	REGION(gram_bootblock, 0x1a000000, 28K, 1)
+	ROMSTAGE(0x1a007000, 60K)
+	VBOOT2_WORK(0x1a016000, 12K)
+	PRERAM_CBFS_CACHE(0x1a019000, 48K)
 	SRAM_END(0x1a066000)
 
 	/* Bootblock executes out of KSEG0 and sets up the identity mapping.
 	 * This is identical to SRAM above, and thus also limited 64K and
 	 * needs to avoid conflicts with items set up above.
 	 */
-	BOOTBLOCK(0x9a000000, 20K)
+	BOOTBLOCK(0x9a000000, 28K)
+	REGION(kseg0_romstage, 0x9a007000, 60K, 1)
 
 	/*
 	 * Let's use SRAM for stack and CBMEM console.  Always accessed
@@ -53,4 +62,8 @@ SECTIONS
 	 */
 	STACK(0x9b000000, 8K)
 	PRERAM_CBMEM_CONSOLE(0x9b002000, 8K)
+
 }
+
+ASSERT_MIRRORED(bootblock, gram_bootblock)
+ASSERT_MIRRORED(romstage, kseg0_romstage)