google/kukui: Revise FMAP firmware layout

Adjust FMAP sections that
- ELOG only needs 4K (by driver limitation)
- SHARED_DATA only needs 4K or less (for netboot params)
- SMMSTORE is probably not needed since UEFI@ARM is not available yet
- VPD can be smaller (most x86 devices have only 16/8K for RO/RW)
- Increase RW_LEGACY to 1M (recommended value)
- Move all new saved space to CBFS

BUG=b:134624821
TEST=Built Kukui image and boots on Rev2 units.

Change-Id: Id2910df73ea47bfa32e056d631d1c3e5f1eed0d1
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33239
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Hung-Te Lin 2019-06-06 09:40:57 +08:00 committed by Patrick Georgi
parent adc3235eb7
commit 8d83c662c3
1 changed files with 18 additions and 18 deletions

View File

@ -1,30 +1,30 @@
FLASH@0x0 0x800000 { FLASH@0x0 0x800000 {
WP_RO@0x0 0x200000 { WP_RO@0x0 0x200000 {
RO_SECTION@0x0 0x1f0000 { RO_SECTION@0x0 0x1f8000 {
BOOTBLOCK@0 32K BOOTBLOCK@0 32K
FMAP@0x8000 0x1000 FMAP@0x8000 0x1000
COREBOOT(CBFS)@0x9000 0x1e4000 COREBOOT(CBFS)@0x9000 0x1ec000
GBB@0x1ed000 0x2f00 GBB 0x2f00
RO_FRID@0x1eff00 0x100 RO_FRID 0x100
} }
RO_VPD(PRESERVE)@0x1f0000 0x10000 RO_VPD(PRESERVE)@0x1f8000 0x8000
} }
RW_SECTION_A@0x200000 0x78000 { RW_SECTION_A@0x200000 0x7c000 {
VBLOCK_A@0x0 0x2000 VBLOCK_A@0x0 0x2000
FW_MAIN_A(CBFS)@0x2000 0x75f00 FW_MAIN_A(CBFS) 0x79f00
RW_FWID_A@0x77f00 0x100 RW_FWID_A 0x100
} }
RW_SHARED@0x278000 0x2000 { RW_SHARED@0x27c000 0x1000 {
SHARED_DATA@0x0 0x2000 SHARED_DATA@0x0 0x1000
} }
RW_NVRAM(PRESERVE)@0x27a000 0x2000 RW_NVRAM(PRESERVE)@0x27d000 0x2000
RW_ELOG(PRESERVE)@0x27c000 0x4000 # ELOG driver has hard-coded the size to 4k.
RW_SECTION_B@0x280000 0x78000 { RW_ELOG(PRESERVE)@0x27f000 0x1000
RW_SECTION_B@0x280000 0x7c000 {
VBLOCK_B@0x0 0x2000 VBLOCK_B@0x0 0x2000
FW_MAIN_B(CBFS)@0x2000 0x75f00 FW_MAIN_B(CBFS) 0x79f00
RW_FWID_B@0x77f00 0x100 RW_FWID_B 0x100
} }
RW_VPD(PRESERVE)@0x2f8000 0x8000 RW_VPD(PRESERVE)@0x2fc000 0x4000
SMMSTORE(PRESERVE)@0x300000 0x20000 RW_LEGACY(CBFS)@0x300000 0x100000
RW_LEGACY(CBFS)@0x320000 0xe0000
} }