From e5861828ee4357a3df94a8670da1fe9e628deb47 Mon Sep 17 00:00:00 2001 From: Hung-Te Lin Date: Mon, 4 Mar 2019 16:48:05 +0800 Subject: mainboard: Enable PRESERVE flag in all vboot/chromeos FMD files For Chrome OS (or vboot), The PRESERVE flags should be applied on following sections: RO_PRESERVE, RO_VPD, RW_PRESERVE, RW_ELOG, RW_NVRAM, RW_SMMSTORE, RW_VPD, RO_FSG (b:116326638), SI_GBE (chromium:936768), SI_PDR (chromium:936768) With the new PRESERVE flag, we don't need RO_PRESERVE and RW_PRESERVE in the future. But it's still no harm to use it if there are multiple sections all needing to be preserved. BUG=chromium:936768 TEST=Builds google/eve and google/kukui inside Chrome OS source tree. Also boots successfully on eve and kukui devices. Change-Id: I6664ae3d955001ed14374e2788d400ba5fb9b7f8 Signed-off-by: Hung-Te Lin Reviewed-on: https://review.coreboot.org/c/coreboot/+/31709 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/mainboard/opencellular/elgon/vboot.fmd | 6 +++--- src/mainboard/opencellular/rotundu/chromeos.fmd | 6 +++--- src/mainboard/opencellular/rotundu/vboot-16M.fmd | 4 ++-- src/mainboard/opencellular/rotundu/vboot-8M.fmd | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/mainboard/opencellular') diff --git a/src/mainboard/opencellular/elgon/vboot.fmd b/src/mainboard/opencellular/elgon/vboot.fmd index b9a1edf329..0d6af2d12e 100644 --- a/src/mainboard/opencellular/elgon/vboot.fmd +++ b/src/mainboard/opencellular/elgon/vboot.fmd @@ -13,7 +13,7 @@ FLASH@0x0 16M { COREBOOT(CBFS)@0x80000 0x2fc000 GBB@0x37c000 0x80000 } - RO_VPD@0x3fc000 0x4000 + RO_VPD(PRESERVE)@0x3fc000 0x4000 } RW_SECTION_A@0x400000 0x5fa000 { VBLOCK_A@0x0 0x2000 @@ -25,6 +25,6 @@ FLASH@0x0 16M { FW_MAIN_B(CBFS)@0x2000 0x5f7f00 RW_FWID_B@0x5f9f00 0x100 } - RW_ELOG@0xff4000 0x4000 - RW_VPD@0xff8000 0x8000 + RW_ELOG(PRESERVE)@0xff4000 0x4000 + RW_VPD(PRESERVE)@0xff8000 0x8000 } diff --git a/src/mainboard/opencellular/rotundu/chromeos.fmd b/src/mainboard/opencellular/rotundu/chromeos.fmd index 913bf97291..7be08dc27b 100644 --- a/src/mainboard/opencellular/rotundu/chromeos.fmd +++ b/src/mainboard/opencellular/rotundu/chromeos.fmd @@ -15,15 +15,15 @@ FLASH@0xff800000 0x800000 { RW_FWID_B@0xeffc0 0x40 } RW_MRC_CACHE@0x1e0000 0x10000 - RW_ELOG@0x1f0000 0x4000 + RW_ELOG(PRESERVE)@0x1f0000 0x4000 RW_SHARED@0x1f4000 0x4000 { SHARED_DATA@0x0 0x2000 VBLOCK_DEV@0x2000 0x2000 } - RW_VPD@0x1f8000 0x2000 + RW_VPD(PRESERVE)@0x1f8000 0x2000 RW_UNUSED@0x1fa000 0x106000 WP_RO@0x300000 0x200000 { - RO_VPD@0x0 0x4000 + RO_VPD(PRESERVE)@0x0 0x4000 RO_UNUSED@0x4000 0xc000 RO_SECTION@0x10000 0x1f0000 { FMAP@0x0 0x800 diff --git a/src/mainboard/opencellular/rotundu/vboot-16M.fmd b/src/mainboard/opencellular/rotundu/vboot-16M.fmd index ec078e536c..c1bedbf64b 100644 --- a/src/mainboard/opencellular/rotundu/vboot-16M.fmd +++ b/src/mainboard/opencellular/rotundu/vboot-16M.fmd @@ -15,9 +15,9 @@ FLASH 16M { RW_FWID_A@0x3fffc0 0x40 } RW_MRC_CACHE@0x800000 0x10000 - RW_VPD@0x810000 0x2000 + RW_VPD(PRESERVE)@0x810000 0x2000 WP_RO@0x812000 0x4ee000 { - RO_VPD@0x0 0x4000 + RO_VPD(PRESERVE)@0x0 0x4000 RO_SECTION@0x4000 0x4ea000 { FMAP@0x0 0x800 RO_FRID@0x800 0x40 diff --git a/src/mainboard/opencellular/rotundu/vboot-8M.fmd b/src/mainboard/opencellular/rotundu/vboot-8M.fmd index 623f86a4fc..42b8b3151d 100644 --- a/src/mainboard/opencellular/rotundu/vboot-8M.fmd +++ b/src/mainboard/opencellular/rotundu/vboot-8M.fmd @@ -15,9 +15,9 @@ FLASH 8M { RW_FWID_A@0x150000 0x40 } RW_MRC_CACHE@0x2a0080 0x10000 - RW_VPD@0x2b0080 0x2000 + RW_VPD(PRESERVE)@0x2b0080 0x2000 WP_RO@0x2b2080 0x24df80 { - RO_VPD@0x0 0x4000 + RO_VPD(PRESERVE)@0x0 0x4000 RO_SECTION@0x4000 0x249f80 { FMAP@0x0 0x800 RO_FRID@0x800 0x40 -- cgit v1.2.3