Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41016 )
Change subject: mb/google/octopus: Fix default FMD ......................................................................
mb/google/octopus: Fix default FMD
On Apollo Lake/Gemini Lake platforms, FSP requires more than a simple RW_MRC_CACHE; without the RECOVERY and VAR cache regions, FSP-m will fail on s3 resume and trigger a full reset instead.
This fixes the default.fmd for octopus to match that used for reef.
Test: build/boot google/ampton, verify sleep/resume works under Linux with 5.x kernel.
Change-Id: I8565aa93256df7d6e0b359d70e9305f34e5ccb60 Signed-off-by: Matt DeVillier matt.devillier@gmail.com --- M 3rdparty/libgfxinit M src/mainboard/google/octopus/default.fmd 2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/41016/1
diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit index cdbfce2..12d71aa 160000 --- a/3rdparty/libgfxinit +++ b/3rdparty/libgfxinit @@ -1 +1 @@ -Subproject commit cdbfce275777f2fd142e3a3c73469807a4c40207 +Subproject commit 12d71aa3a542da31a26591ab6a09ed8602d3d34f diff --git a/src/mainboard/google/octopus/default.fmd b/src/mainboard/google/octopus/default.fmd index 6e6b64f..bf51a1c 100644 --- a/src/mainboard/google/octopus/default.fmd +++ b/src/mainboard/google/octopus/default.fmd @@ -4,7 +4,11 @@ IFWI@0x0 0x1ff000 # SMMSTORE requires 64k alignment SMMSTORE@0xa5e000 0x40000 - RW_MRC_CACHE 0x10000 + UNIFIED_MRC_CACHE 0x21000 { + RECOVERY_MRC_CACHE 0x10000 + RW_MRC_CACHE 0x10000 + RW_VAR_MRC_CACHE 0x1000 + } FMAP 0x300 COREBOOT(CBFS) BIOS_UNUSABLE 0x4f000