From e153101b9a69f3bc2c43eeefd3a4dfa44e6bb1a2 Mon Sep 17 00:00:00 2001 From: Daniel Kurtz Date: Thu, 17 May 2018 15:55:39 -0600 Subject: [PATCH] google/kahlee: Swap UNIFIED_MRC_CACHE and RW_SECTION_A in fwmap The firmware_Mosys FAFT test does not allow RW_SECTION_A, RW_SECTION_B or RW_SHARED to be 0-sized, nor located at offset 0x00000000. Swap UNIFIED_MRC_CACHE and RW_SECTION_A to pass this test. BUG=b:79865447 TEST=test_that -b grunt ${IP} firmware_Mosys Change-Id: If60919fd998ac786d58a5a258d7b5ded727db64b Signed-off-by: Daniel Kurtz Reviewed-on: https://review.coreboot.org/26356 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- .../google/kahlee/variants/grunt/chromeos.fmd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mainboard/google/kahlee/variants/grunt/chromeos.fmd b/src/mainboard/google/kahlee/variants/grunt/chromeos.fmd index 11c4bf07ff..749546dd8d 100644 --- a/src/mainboard/google/kahlee/variants/grunt/chromeos.fmd +++ b/src/mainboard/google/kahlee/variants/grunt/chromeos.fmd @@ -1,20 +1,20 @@ FLASH@0xFF000000 0x1000000 { SI_BIOS@0x0 0x1000000 { - RW_SECTION_A@0x0 0x21E000 { + UNIFIED_MRC_CACHE@0x0 0x21000 { + RECOVERY_MRC_CACHE@0x0 0x10000 + RW_MRC_CACHE@0x10000 0x10000 + RW_VAR_MRC_CACHE@0x20000 0x1000 + } + RW_SECTION_A@0x21000 0x21E000 { VBLOCK_A@0x0 0x10000 FW_MAIN_A(CBFS)@0x10000 0x20DFC0 RW_FWID_A@0x21DFC0 0x40 } - RW_SECTION_B@0x21E000 0x21E000 { + RW_SECTION_B@0x23F000 0x21E000 { VBLOCK_B@0x0 0x10000 FW_MAIN_B(CBFS)@0x10000 0x20DFC0 RW_FWID_B@0x21DFC0 0x40 } - UNIFIED_MRC_CACHE@0x43C000 0x21000 { - RECOVERY_MRC_CACHE@0x0 0x10000 - RW_MRC_CACHE@0x10000 0x10000 - RW_VAR_MRC_CACHE@0x20000 0x1000 - } RW_ELOG@0x45D000 0x4000 RW_SHARED@0x461000 0x4000 {