From 064d6cb8a53b022244082cb2c2ebce2f5fb02486 Mon Sep 17 00:00:00 2001 From: Hung-Te Lin Date: Thu, 17 Oct 2019 12:42:28 +0800 Subject: mb/google: Shrink GBB section size Chrome OS firmware images have moved bitmap resources from GBB into CBFS for a long time, so the GBB should only hold firmware keys and HWID, that is usually less than 10k. ARM boards usually limit GBB to 0x2f00 (see gru, cheza and kukui) but many recent x86 simply copy from old settings and may run out of space when we want to add more resources, for example EC RO software sync. Note, changing the GBB section (inside RO) implies RO update, so this change *must not* be cherry-picked back to old firmware branches if some devices were already shipped. BRANCH=none BUG=None TEST=make # board=darllion,hatch,kahlee,octopus,sarien Change-Id: I615cd7b53b556019f2d54d0df7ac2723d36ee6cf Signed-off-by: Hung-Te Lin Reviewed-on: https://review.coreboot.org/c/coreboot/+/36088 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi Reviewed-by: Mathew King Reviewed-by: Duncan Laurie Reviewed-by: Paul Menzel --- src/mainboard/google/drallion/chromeos.fmd | 4 ++-- src/mainboard/google/hatch/chromeos-16MiB.fmd | 4 ++-- src/mainboard/google/hatch/chromeos.fmd | 4 ++-- src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd | 4 ++-- src/mainboard/google/octopus/chromeos.fmd | 4 ++-- src/mainboard/google/sarien/chromeos.fmd | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/mainboard/google/drallion/chromeos.fmd b/src/mainboard/google/drallion/chromeos.fmd index 8bab919c6d..6e9170ed41 100644 --- a/src/mainboard/google/drallion/chromeos.fmd +++ b/src/mainboard/google/drallion/chromeos.fmd @@ -40,8 +40,8 @@ FLASH@0xfe000000 0x2000000 { FMAP@0x0 0x800 RO_FRID@0x800 0x40 RO_FRID_PAD@0x840 0x7c0 - GBB@0x1000 0xef000 - COREBOOT(CBFS)@0xf0000 0x300000 + GBB@0x1000 0x3000 + COREBOOT(CBFS)@0x4000 0x3ec000 } } } diff --git a/src/mainboard/google/hatch/chromeos-16MiB.fmd b/src/mainboard/google/hatch/chromeos-16MiB.fmd index eb92bb0a01..8880a4f9fe 100644 --- a/src/mainboard/google/hatch/chromeos-16MiB.fmd +++ b/src/mainboard/google/hatch/chromeos-16MiB.fmd @@ -35,8 +35,8 @@ FLASH@0xff000000 0x1000000 { FMAP@0x0 0x800 RO_FRID@0x800 0x40 RO_FRID_PAD@0x840 0x7c0 - GBB@0x1000 0xef000 - COREBOOT(CBFS)@0xf0000 0x30c000 + GBB@0x1000 0x3000 + COREBOOT(CBFS)@0x4000 0x3f8000 } } } diff --git a/src/mainboard/google/hatch/chromeos.fmd b/src/mainboard/google/hatch/chromeos.fmd index 45dbc81716..8368b0a44b 100644 --- a/src/mainboard/google/hatch/chromeos.fmd +++ b/src/mainboard/google/hatch/chromeos.fmd @@ -39,8 +39,8 @@ FLASH@0xfe000000 0x2000000 { FMAP@0x0 0x800 RO_FRID@0x800 0x40 RO_FRID_PAD@0x840 0x7c0 - GBB@0x1000 0xef000 - COREBOOT(CBFS)@0xf0000 0x30c000 + GBB@0x1000 0x3000 + COREBOOT(CBFS)@0x4000 0x3f8000 } } } diff --git a/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd b/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd index b746545488..d7d0a886d3 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd +++ b/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd @@ -33,8 +33,8 @@ FLASH@0xFF000000 0x1000000 { FMAP@0x0 0x800 RO_FRID@0x800 0x40 RO_FRID_PAD@0x840 0x7c0 - GBB@0x1000 0x70000 - COREBOOT(CBFS)@0x71000 0x210000 + GBB@0x1000 0x3000 + COREBOOT(CBFS)@0x4000 0x27d000 } } } diff --git a/src/mainboard/google/octopus/chromeos.fmd b/src/mainboard/google/octopus/chromeos.fmd index fbdafaa3a2..332465ae19 100644 --- a/src/mainboard/google/octopus/chromeos.fmd +++ b/src/mainboard/google/octopus/chromeos.fmd @@ -7,8 +7,8 @@ FLASH 16M { FMAP@0x0 0x800 RO_FRID@0x800 0x40 RO_FRID_PAD@0x840 0x7c0 - COREBOOT(CBFS)@0x1000 0x1bb000 - GBB@0x1bc000 0x40000 + COREBOOT(CBFS)@0x1000 0x1f8000 + GBB@0x1f9000 0x3000 } } MISC_RW@0x400000 0x30000 { diff --git a/src/mainboard/google/sarien/chromeos.fmd b/src/mainboard/google/sarien/chromeos.fmd index ece0eda099..65a915a2c0 100644 --- a/src/mainboard/google/sarien/chromeos.fmd +++ b/src/mainboard/google/sarien/chromeos.fmd @@ -41,8 +41,8 @@ FLASH@0xfe000000 0x2000000 { FMAP@0x0 0x800 RO_FRID@0x800 0x40 RO_FRID_PAD@0x840 0x7c0 - GBB@0x1000 0xef000 - COREBOOT(CBFS)@0xf0000 0x300000 + GBB@0x1000 0x3000 + COREBOOT(CBFS)@0x4000 0x3ec000 } } } -- cgit v1.2.3