diff options
| author | Martin Roth <martinroth@chromium.org> | 2020-07-15 11:50:37 -0600 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2020-07-16 22:20:27 +0000 |
| commit | 37d1206c6ebd80c14f350d5eddfc1b17b6d9a705 (patch) | |
| tree | 8120c485eceff92ade7e3c5118901119d5da6c4d | |
| parent | 6812626382548691e1b7c4828175859ee3fd0144 (diff) | |
| download | coreboot-37d1206c6ebd80c14f350d5eddfc1b17b6d9a705.tar.xz | |
soc/amd/picasso: Get rid of VERSTAGE_SIZE
Currently, the code and data in psp_verstage is ~59K. Adding the code
to save vbnv to the SPI rom increases that to 66K.
Getting rid of VERSTAGE_SIZE allows verstage to grow as it needs to.
BUG=b:161366241
TEST=Build & Boot Morphius with VBOOT_VBNV_CMOS_BACKUP_TO_FLASH enabled
Signed-off-by: Martin Roth <martinroth@chromium.org>
Change-Id: Ic6853b70073f9e781fc10402a2a47c9c8e0d49d3
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43486
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/soc/amd/picasso/memlayout_psp_verstage.ld | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/soc/amd/picasso/memlayout_psp_verstage.ld b/src/soc/amd/picasso/memlayout_psp_verstage.ld index d2b409c850..0fed7b0e83 100644 --- a/src/soc/amd/picasso/memlayout_psp_verstage.ld +++ b/src/soc/amd/picasso/memlayout_psp_verstage.ld @@ -11,8 +11,6 @@ #define PSP_SRAM_SIZE 160K #define VERSTAGE_START 0x15000 -#define VERSTAGE_SIZE 60K -#define VBOOT_WORK_START VERSTAGE_START + VERSTAGE_SIZE #define VBOOT_WORK_SIZE 12K #define FMAP_CACHE_SIZE 2K @@ -50,9 +48,11 @@ SECTIONS .bss : { *(.bss*) } _bss_end = .; - _everstage = _verstage + VERSTAGE_SIZE; + ALIGN_COUNTER(64) + _everstage = .; - REGION(vboot2_work, VBOOT_WORK_START, VBOOT_WORK_SIZE, 64) + ALIGN_COUNTER(64) + REGION(vboot2_work, ., VBOOT_WORK_SIZE, 64) FMAP_CACHE(., FMAP_SIZE) |