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 <hungte@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31709
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>

12 files changed, 51 insertions, 51 deletions

diff --git a/src/mainboard/intel/baskingridge/chromeos.fmd b/src/mainboard/intel/baskingridge/chromeos.fmd
index 5ac32447ec..9852a2209c 100644
--- a/src/mainboard/intel/baskingridge/chromeos.fmd
+++ b/src/mainboard/intel/baskingridge/chromeos.fmd
@@ -4,7 +4,7 @@ FLASH@0xff800000 0x800000 {
 		SI_ME@0x1000 0x17f000
 	}
 	SI_BIOS@0x180000 0x680000 {
-		RW_VPD@0x0 0x1000
+		RW_VPD(PRESERVE)@0x0 0x1000
 		RW_UNUSED@0x1000 0x67000
 		RW_SHARED@0x68000 0x18000 {
 			RW_ENVIRONMENT@0x0 0x4000
@@ -24,7 +24,7 @@ FLASH@0xff800000 0x800000 {
 			RW_UNUSED_B@0x90000 0x70000
 		}
 		RO_UNUSED_1@0x280000 0x170000
-		RO_VPD@0x3f0000 0x20000
+		RO_VPD(PRESERVE)@0x3f0000 0x20000
 		RO_UNUSED_2@0x410000 0xe0000
 		RO_SECTION@0x4f0000 0x190000 {
 			FMAP@0x0 0x800
diff --git a/src/mainboard/intel/bayleybay_fsp/chromeos.fmd b/src/mainboard/intel/bayleybay_fsp/chromeos.fmd
index 913bf97291..7be08dc27b 100644
--- a/src/mainboard/intel/bayleybay_fsp/chromeos.fmd
+++ b/src/mainboard/intel/bayleybay_fsp/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/intel/cannonlake_rvp/chromeos.fmd b/src/mainboard/intel/cannonlake_rvp/chromeos.fmd
index 65d22c3950..39bd6c5237 100644
--- a/src/mainboard/intel/cannonlake_rvp/chromeos.fmd
+++ b/src/mainboard/intel/cannonlake_rvp/chromeos.fmd
@@ -20,18 +20,18 @@ FLASH@0xff000000 0x1000000 {
 				RECOVERY_MRC_CACHE@0x0 0x10000
 				RW_MRC_CACHE@0x10000 0x10000
 			}
-			RW_ELOG@0x20000 0x4000
+			RW_ELOG(PRESERVE)@0x20000 0x4000
 			RW_SHARED@0x24000 0x4000 {
 				SHARED_DATA@0x0 0x2000
 				VBLOCK_DEV@0x2000 0x2000
 			}
-			RW_VPD@0x28000 0x2000
-			RW_NVRAM@0x2a000 0x6000
+			RW_VPD(PRESERVE)@0x28000 0x2000
+			RW_NVRAM(PRESERVE)@0x2a000 0x6000
 		}
-		SMMSTORE@0x700000 0x40000
+		SMMSTORE(PRESERVE)@0x700000 0x40000
 		RW_LEGACY(CBFS)@0x740000 0x1c0000
 		WP_RO@0x900000 0x380000 {
-			RO_VPD@0x0 0x4000
+			RO_VPD(PRESERVE)@0x0 0x4000
 			RO_UNUSED@0x4000 0xc000
 			RO_SECTION@0x10000 0x370000 {
 				FMAP@0x0 0x800
diff --git a/src/mainboard/intel/coffeelake_rvp/chromeos.fmd b/src/mainboard/intel/coffeelake_rvp/chromeos.fmd
index 65d22c3950..39bd6c5237 100644
--- a/src/mainboard/intel/coffeelake_rvp/chromeos.fmd
+++ b/src/mainboard/intel/coffeelake_rvp/chromeos.fmd
@@ -20,18 +20,18 @@ FLASH@0xff000000 0x1000000 {
 				RECOVERY_MRC_CACHE@0x0 0x10000
 				RW_MRC_CACHE@0x10000 0x10000
 			}
-			RW_ELOG@0x20000 0x4000
+			RW_ELOG(PRESERVE)@0x20000 0x4000
 			RW_SHARED@0x24000 0x4000 {
 				SHARED_DATA@0x0 0x2000
 				VBLOCK_DEV@0x2000 0x2000
 			}
-			RW_VPD@0x28000 0x2000
-			RW_NVRAM@0x2a000 0x6000
+			RW_VPD(PRESERVE)@0x28000 0x2000
+			RW_NVRAM(PRESERVE)@0x2a000 0x6000
 		}
-		SMMSTORE@0x700000 0x40000
+		SMMSTORE(PRESERVE)@0x700000 0x40000
 		RW_LEGACY(CBFS)@0x740000 0x1c0000
 		WP_RO@0x900000 0x380000 {
-			RO_VPD@0x0 0x4000
+			RO_VPD(PRESERVE)@0x0 0x4000
 			RO_UNUSED@0x4000 0xc000
 			RO_SECTION@0x10000 0x370000 {
 				FMAP@0x0 0x800
diff --git a/src/mainboard/intel/coffeelake_rvp/chromeos_32MB.fmd b/src/mainboard/intel/coffeelake_rvp/chromeos_32MB.fmd
index bfbd304d36..62e0f5d6d1 100644
--- a/src/mainboard/intel/coffeelake_rvp/chromeos_32MB.fmd
+++ b/src/mainboard/intel/coffeelake_rvp/chromeos_32MB.fmd
@@ -20,18 +20,18 @@ FLASH@0xfe000000 0x2000000 {
 				RECOVERY_MRC_CACHE@0x0 0x10000
 				RW_MRC_CACHE@0x10000 0x10000
 			}
-			RW_ELOG@0x20000 0x4000
+			RW_ELOG(PRESERVE)@0x20000 0x4000
 			RW_SHARED@0x24000 0x4000 {
 				SHARED_DATA@0x0 0x2000
 				VBLOCK_DEV@0x2000 0x2000
 			}
-			RW_VPD@0x28000 0x2000
-			RW_NVRAM@0x2a000 0x6000
+			RW_VPD(PRESERVE)@0x28000 0x2000
+			RW_NVRAM(PRESERVE)@0x2a000 0x6000
 		}
-		SMMSTORE@0x5d0000 0x40000
+		SMMSTORE(PRESERVE)@0x5d0000 0x40000
 		RW_LEGACY(CBFS)@0x610000 0x1c0000
 		WP_RO@0x7d0000 0x430000 {
-			RO_VPD@0x0 0x4000
+			RO_VPD(PRESERVE)@0x0 0x4000
 			RO_SECTION@0x4000 0x42c000 {
 				FMAP@0x0 0x800
 				RO_FRID@0x800 0x40
diff --git a/src/mainboard/intel/galileo/vboot.fmd b/src/mainboard/intel/galileo/vboot.fmd
index efc4a7587a..4d349bdf19 100644
--- a/src/mainboard/intel/galileo/vboot.fmd
+++ b/src/mainboard/intel/galileo/vboot.fmd
@@ -29,17 +29,17 @@ 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_NVRAM@0x1fa000 0x6000
-		SMMSTORE@0x200000 0x40000
+		RW_VPD(PRESERVE)@0x1f8000 0x2000
+		RW_NVRAM(PRESERVE)@0x1fa000 0x6000
+		SMMSTORE(PRESERVE)@0x200000 0x40000
 		RW_LEGACY(CBFS)@0x240000 0x1c0000
 		WP_RO@0x400000 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/intel/glkrvp/chromeos.fmd b/src/mainboard/intel/glkrvp/chromeos.fmd
index e513f7cbf7..5d4ba46b58 100644
--- a/src/mainboard/intel/glkrvp/chromeos.fmd
+++ b/src/mainboard/intel/glkrvp/chromeos.fmd
@@ -2,7 +2,7 @@ FLASH 16M {
 	WP_RO@0x0 0x400000 {
 		SI_DESC@0x0 0x1000
 		IFWI@0x1000 0x1ff000
-		RO_VPD@0x200000 0x4000
+		RO_VPD(PRESERVE)@0x200000 0x4000
 		RO_SECTION@0x204000 0x1fc000 {
 			FMAP@0x0 0x800
 			RO_FRID@0x800 0x40
@@ -18,12 +18,12 @@ FLASH 16M {
             RW_MRC_CACHE@0x10000 0x20000
             RW_VAR_MRC_CACHE@0x30000 0x1000
         }
-		RW_ELOG@0x31000 0x4000
+		RW_ELOG(PRESERVE)@0x31000 0x4000
 		RW_SHARED@0x35000 0x4000 {
 			SHARED_DATA@0x0 0x2000
 			VBLOCK_DEV@0x2000 0x2000
 		}
-		RW_VPD@0x39000 0x2000
+		RW_VPD(PRESERVE)@0x39000 0x2000
 		FPF_STATUS@0x3B000 0x1000
 		TMP_UNUSED_HOLE@0x3C000 0xE000
 	}
@@ -37,8 +37,8 @@ FLASH 16M {
 		FW_MAIN_B(CBFS)@0x10000 0x4677c0
 		RW_FWID_B@0x4777c0 0x40
 	}
-	RW_NVRAM@0xd39000 0x6000
-	SMMSTORE@0xd40000 0x40000
+	RW_NVRAM(PRESERVE)@0xd39000 0x6000
+	SMMSTORE(PRESERVE)@0xd40000 0x40000
 	RW_LEGACY(CBFS)@0xd80000 0x1b0000
 	BIOS_UNUSABLE@0xf3f000 0x40000
 	DEVICE_EXTENSION@0xf7f000 0x80000
diff --git a/src/mainboard/intel/icelake_rvp/chromeos.fmd b/src/mainboard/intel/icelake_rvp/chromeos.fmd
index c588649847..f4db8b4bc7 100644
--- a/src/mainboard/intel/icelake_rvp/chromeos.fmd
+++ b/src/mainboard/intel/icelake_rvp/chromeos.fmd
@@ -20,18 +20,18 @@ FLASH@0xff000000 0x1000000 {
 				RECOVERY_MRC_CACHE@0x0 0x10000
 				RW_MRC_CACHE@0x10000 0x10000
 			}
-			RW_ELOG@0x20000 0x4000
+			RW_ELOG(PRESERVE)@0x20000 0x4000
 			RW_SHARED@0x24000 0x4000 {
 				SHARED_DATA@0x0 0x2000
 				VBLOCK_DEV@0x2000 0x2000
 			}
-			RW_VPD@0x28000 0x2000
-			RW_NVRAM@0x2a000 0x6000
+			RW_VPD(PRESERVE)@0x28000 0x2000
+			RW_NVRAM(PRESERVE)@0x2a000 0x6000
 		}
-		SMMSTORE@0x5d0000 0x40000
+		SMMSTORE(PRESERVE)@0x5d0000 0x40000
 		RW_LEGACY(CBFS)@0x610000 0x1c0000
 		WP_RO@0x7d0000 0x430000 {
-			RO_VPD@0x0 0x4000
+			RO_VPD(PRESERVE)@0x0 0x4000
 			RO_SECTION@0x4000 0x42c000 {
 				FMAP@0x0 0x800
 				RO_FRID@0x800 0x40
diff --git a/src/mainboard/intel/kblrvp/chromeos.fmd b/src/mainboard/intel/kblrvp/chromeos.fmd
index 78c6ab1908..9ba1bf7275 100644
--- a/src/mainboard/intel/kblrvp/chromeos.fmd
+++ b/src/mainboard/intel/kblrvp/chromeos.fmd
@@ -15,17 +15,17 @@ FLASH@0xff000000 0x1000000 {
 			RW_FWID_B@0x3effc0 0x40
 		}
 		RW_MRC_CACHE@0x7e0000 0x10000
-		RW_ELOG@0x7f0000 0x4000
+		RW_ELOG(PRESERVE)@0x7f0000 0x4000
 		RW_SHARED@0x7f4000 0x4000 {
 			SHARED_DATA@0x0 0x2000
 			VBLOCK_DEV@0x2000 0x2000
 		}
-		RW_VPD@0x7f8000 0x2000
-		RW_NVRAM@0x7fa000 0x6000
-		SMMSTORE@0x800000 0x40000
+		RW_VPD(PRESERVE)@0x7f8000 0x2000
+		RW_NVRAM(PRESERVE)@0x7fa000 0x6000
+		SMMSTORE(PRESERVE)@0x800000 0x40000
 		RW_LEGACY(CBFS)@0x840000 0x1c0000
 		WP_RO@0xa00000 0x400000 {
-			RO_VPD@0x0 0x4000
+			RO_VPD(PRESERVE)@0x0 0x4000
 			RO_UNUSED@0x4000 0xc000
 			RO_SECTION@0x10000 0x3f0000 {
 				FMAP@0x0 0x800
diff --git a/src/mainboard/intel/kunimitsu/chromeos.fmd b/src/mainboard/intel/kunimitsu/chromeos.fmd
index 78c6ab1908..9ba1bf7275 100644
--- a/src/mainboard/intel/kunimitsu/chromeos.fmd
+++ b/src/mainboard/intel/kunimitsu/chromeos.fmd
@@ -15,17 +15,17 @@ FLASH@0xff000000 0x1000000 {
 			RW_FWID_B@0x3effc0 0x40
 		}
 		RW_MRC_CACHE@0x7e0000 0x10000
-		RW_ELOG@0x7f0000 0x4000
+		RW_ELOG(PRESERVE)@0x7f0000 0x4000
 		RW_SHARED@0x7f4000 0x4000 {
 			SHARED_DATA@0x0 0x2000
 			VBLOCK_DEV@0x2000 0x2000
 		}
-		RW_VPD@0x7f8000 0x2000
-		RW_NVRAM@0x7fa000 0x6000
-		SMMSTORE@0x800000 0x40000
+		RW_VPD(PRESERVE)@0x7f8000 0x2000
+		RW_NVRAM(PRESERVE)@0x7fa000 0x6000
+		SMMSTORE(PRESERVE)@0x800000 0x40000
 		RW_LEGACY(CBFS)@0x840000 0x1c0000
 		WP_RO@0xa00000 0x400000 {
-			RO_VPD@0x0 0x4000
+			RO_VPD(PRESERVE)@0x0 0x4000
 			RO_UNUSED@0x4000 0xc000
 			RO_SECTION@0x10000 0x3f0000 {
 				FMAP@0x0 0x800
diff --git a/src/mainboard/intel/strago/chromeos.fmd b/src/mainboard/intel/strago/chromeos.fmd
index 215247f582..923c8ee18a 100644
--- a/src/mainboard/intel/strago/chromeos.fmd
+++ b/src/mainboard/intel/strago/chromeos.fmd
@@ -15,17 +15,17 @@ 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 0x6000
-		SMMSTORE@0x200000 0x40000
+		SMMSTORE(PRESERVE)@0x200000 0x40000
 		RW_LEGACY(CBFS)@0x240000 0x1c0000
 		WP_RO@0x400000 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/intel/wtm2/chromeos.fmd b/src/mainboard/intel/wtm2/chromeos.fmd
index 5ac32447ec..9852a2209c 100644
--- a/src/mainboard/intel/wtm2/chromeos.fmd
+++ b/src/mainboard/intel/wtm2/chromeos.fmd
@@ -4,7 +4,7 @@ FLASH@0xff800000 0x800000 {
 		SI_ME@0x1000 0x17f000
 	}
 	SI_BIOS@0x180000 0x680000 {
-		RW_VPD@0x0 0x1000
+		RW_VPD(PRESERVE)@0x0 0x1000
 		RW_UNUSED@0x1000 0x67000
 		RW_SHARED@0x68000 0x18000 {
 			RW_ENVIRONMENT@0x0 0x4000
@@ -24,7 +24,7 @@ FLASH@0xff800000 0x800000 {
 			RW_UNUSED_B@0x90000 0x70000
 		}
 		RO_UNUSED_1@0x280000 0x170000
-		RO_VPD@0x3f0000 0x20000
+		RO_VPD(PRESERVE)@0x3f0000 0x20000
 		RO_UNUSED_2@0x410000 0xe0000
 		RO_SECTION@0x4f0000 0x190000 {
 			FMAP@0x0 0x800