GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@chromium.org>
Reviewed-on: https://review.coreboot.org/13733
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Julius Werner 2016-02-18 12:56:26 -08:00
parent 862c385f9a
commit 0e3d7de741
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/soc/imgtec/pistachio/include/soc/memlayout.ld
View File

@ -17,6 +17,13 @@
#include <arch/header.ld> #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 SECTIONS
{ {
/* /*
@ -36,16 +43,18 @@ SECTIONS
* and then through the identity mapping in ROM stage. * and then through the identity mapping in ROM stage.
*/ */
SRAM_START(0x1a000000) SRAM_START(0x1a000000)
ROMSTAGE(0x1a005000, 60K) REGION(gram_bootblock, 0x1a000000, 28K, 1)
VBOOT2_WORK(0x1a014000, 12K) ROMSTAGE(0x1a007000, 60K)
PRERAM_CBFS_CACHE(0x1a017000, 56K) VBOOT2_WORK(0x1a016000, 12K)
PRERAM_CBFS_CACHE(0x1a019000, 48K)
SRAM_END(0x1a066000) SRAM_END(0x1a066000)
/* Bootblock executes out of KSEG0 and sets up the identity mapping. /* Bootblock executes out of KSEG0 and sets up the identity mapping.
* This is identical to SRAM above, and thus also limited 64K and * This is identical to SRAM above, and thus also limited 64K and
* needs to avoid conflicts with items set up above. * 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 * Let's use SRAM for stack and CBMEM console. Always accessed
@ -53,4 +62,8 @@ SECTIONS
*/ */
STACK(0x9b000000, 8K) STACK(0x9b000000, 8K)
PRERAM_CBMEM_CONSOLE(0x9b002000, 8K) PRERAM_CBMEM_CONSOLE(0x9b002000, 8K)
} }
ASSERT_MIRRORED(bootblock, gram_bootblock)
ASSERT_MIRRORED(romstage, kseg0_romstage)