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>

56 files changed, 220 insertions, 219 deletions

diff --git a/src/mainboard/google/auron/chromeos.fmd b/src/mainboard/google/auron/chromeos.fmd
index 215247f582..923c8ee18a 100644
--- a/src/mainboard/google/auron/chromeos.fmd
+++ b/src/mainboard/google/auron/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/google/beltino/chromeos.fmd b/src/mainboard/google/beltino/chromeos.fmd
index 215247f582..923c8ee18a 100644
--- a/src/mainboard/google/beltino/chromeos.fmd
+++ b/src/mainboard/google/beltino/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/google/butterfly/chromeos.fmd b/src/mainboard/google/butterfly/chromeos.fmd
index 14c91d7967..93048a37ec 100644
--- a/src/mainboard/google/butterfly/chromeos.fmd
+++ b/src/mainboard/google/butterfly/chromeos.fmd
@@ -15,18 +15,18 @@ 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_ENVIRONMENT@0x1f8000 0x4000
-		RW_VPD@0x1fc000 0x2000
+		RW_VPD(PRESERVE)@0x1fc000 0x2000
 		RW_UNUSED@0x1fe000 0x2000
-		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/google/cheza/chromeos.fmd b/src/mainboard/google/cheza/chromeos.fmd
index e39846a010..71e85562d6 100644
--- a/src/mainboard/google/cheza/chromeos.fmd
+++ b/src/mainboard/google/cheza/chromeos.fmd
@@ -23,17 +23,18 @@ FLASH@0x0 8M {
 			GBB 0x2f00
 			RO_FRID 0x100
 		}
-		RO_VPD 16K
-		RO_PRESERVE {
+		RO_VPD(PRESERVE) 16K
+		# TODO(hungte): Remove RO_PRESERVE.
+		RO_PRESERVE(PRESERVE) {
 			RO_DDR_TRAINING 8K
 			RO_FSG
 		}
 	}
 
-	RW_VPD 32K
-	RW_NVRAM 16K
+	RW_VPD(PRESERVE) 32K
+	RW_NVRAM(PRESERVE) 16K
 	RW_DDR_TRAINING 8K
-	RW_ELOG 4K
+	RW_ELOG(PRESERVE) 4K
 	RW_SHARED 4K {
 		SHARED_DATA
 	}
diff --git a/src/mainboard/google/cyan/chromeos.fmd b/src/mainboard/google/cyan/chromeos.fmd
index 215247f582..923c8ee18a 100644
--- a/src/mainboard/google/cyan/chromeos.fmd
+++ b/src/mainboard/google/cyan/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/google/daisy/chromeos.fmd b/src/mainboard/google/daisy/chromeos.fmd
index 5d6d456902..63bde335cb 100644
--- a/src/mainboard/google/daisy/chromeos.fmd
+++ b/src/mainboard/google/daisy/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x400000 {
 			GBB@0x101000 0xeef00
 			RO_FRID@0x1eff00 0x100
 		}
-		RO_VPD@0x1f0000 0x10000
+		RO_VPD(PRESERVE)@0x1f0000 0x10000
 	}
 	RW_SECTION_A@0x200000 0xf0000 {
 		VBLOCK_A@0x0 0x2000
@@ -19,7 +19,7 @@ FLASH@0x0 0x400000 {
 		FW_MAIN_B(CBFS)@0x2000 0xedf00
 		RW_FWID_B@0xeff00 0x100
 	}
-	RW_VPD@0x3f0000 0x8000
+	RW_VPD(PRESERVE)@0x3f0000 0x8000
 	RW_SHARED@0x3f8000 0x4000 {
 		SHARED_DATA@0x0 0x4000
 	}
diff --git a/src/mainboard/google/dragonegg/chromeos.fmd b/src/mainboard/google/dragonegg/chromeos.fmd
index aabd8c12d0..7bdeb17ac8 100644
--- a/src/mainboard/google/dragonegg/chromeos.fmd
+++ b/src/mainboard/google/dragonegg/chromeos.fmd
@@ -19,19 +19,19 @@ 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
 		}
 		RW_LEGACY(CBFS)@0x5d0000 0x230000
 		# Make WP_RO region align with SPI vendor
 		# memory protected range specification.
 		WP_RO@0x800000 0x400000 {
-			RO_VPD@0x0 0x4000
+			RO_VPD(PRESERVE)@0x0 0x4000
 			RO_SECTION@0x4000 0x3fc000 {
 				FMAP@0x0 0x800
 				RO_FRID@0x800 0x40
diff --git a/src/mainboard/google/eve/chromeos.fmd b/src/mainboard/google/eve/chromeos.fmd
index 145fc7bffa..1cc4a61ae2 100644
--- a/src/mainboard/google/eve/chromeos.fmd
+++ b/src/mainboard/google/eve/chromeos.fmd
@@ -19,18 +19,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@0x800000 0x40000
+		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/google/fizz/chromeos.fmd b/src/mainboard/google/fizz/chromeos.fmd
index 145fc7bffa..1cc4a61ae2 100644
--- a/src/mainboard/google/fizz/chromeos.fmd
+++ b/src/mainboard/google/fizz/chromeos.fmd
@@ -19,18 +19,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@0x800000 0x40000
+		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/google/foster/chromeos.fmd b/src/mainboard/google/foster/chromeos.fmd
index 603d4bb959..f9a531cc4b 100644
--- a/src/mainboard/google/foster/chromeos.fmd
+++ b/src/mainboard/google/foster/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x400000 {
 			GBB@0x201000 0xeef00
 			RO_FRID@0x2eff00 0x100
 		}
-		RO_VPD@0x2f0000 0x10000
+		RO_VPD(PRESERVE)@0x2f0000 0x10000
 	}
 	RW_SECTION_A@0x300000 0x78000 {
 		VBLOCK_A@0x0 0x2000
@@ -17,12 +17,12 @@ FLASH@0x0 0x400000 {
 	RW_SHARED@0x378000 0x4000 {
 		SHARED_DATA@0x0 0x4000
 	}
-	RW_ELOG@0x37c000 0x4000
+	RW_ELOG(PRESERVE)@0x37c000 0x4000
 	RW_SECTION_B@0x380000 0x78000 {
 		VBLOCK_B@0x0 0x2000
 		FW_MAIN_B(CBFS)@0x2000 0x75f00
 		RW_FWID_B@0x77f00 0x100
 	}
-	RW_VPD@0x3f8000 0x4000
-	RW_NVRAM@0x3fc000 0x4000
+	RW_VPD(PRESERVE)@0x3f8000 0x4000
+	RW_NVRAM(PRESERVE)@0x3fc000 0x4000
 }
diff --git a/src/mainboard/google/gale/chromeos.fmd b/src/mainboard/google/gale/chromeos.fmd
index a9bdd7b541..3a55bdcae4 100644
--- a/src/mainboard/google/gale/chromeos.fmd
+++ b/src/mainboard/google/gale/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x800000 {
 			GBB@0x301000 0xdef00
 			RO_FRID@0x3dff00 0x100
 		}
-		RO_VPD@0x3e0000 0x20000
+		RO_VPD(PRESERVE)@0x3e0000 0x20000
 	}
 	RW_SECTION_A@0x400000 0x160000 {
 		VBLOCK_A@0x0 0x2000
@@ -26,8 +26,8 @@ FLASH@0x0 0x800000 {
 		FW_MAIN_B(CBFS)@0x2000 0x14df00
 		RW_FWID_B@0x14ff00 0x100
 	}
-	RW_VPD@0x6e0000 0x8000
-	RW_ELOG@0x6e8000 0x8000
-	RW_NVRAM@0x6f0000 0x10000
+	RW_VPD(PRESERVE)@0x6e0000 0x8000
+	RW_ELOG(PRESERVE)@0x6e8000 0x8000
+	RW_NVRAM(PRESERVE)@0x6f0000 0x10000
 	RW_LEGACY(CBFS)@0x700000 0x100000
 }
diff --git a/src/mainboard/google/glados/chromeos.fmd b/src/mainboard/google/glados/chromeos.fmd
index 78c6ab1908..9ba1bf7275 100644
--- a/src/mainboard/google/glados/chromeos.fmd
+++ b/src/mainboard/google/glados/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/google/gru/chromeos.fmd b/src/mainboard/google/gru/chromeos.fmd
index 477f90a29c..032f472463 100644
--- a/src/mainboard/google/gru/chromeos.fmd
+++ b/src/mainboard/google/gru/chromeos.fmd
@@ -7,24 +7,24 @@ FLASH@0x0 0x800000 {
 			GBB@0x381000 0x5ef00
 			RO_FRID@0x3dff00 0x100
 		}
-		RO_VPD@0x3e0000 0x20000
+		RO_VPD(PRESERVE)@0x3e0000 0x20000
 	}
 	RW_SECTION_A@0x400000 0xe8000 {
 		VBLOCK_A@0x0 0x2000
 		FW_MAIN_A(CBFS)@0x2000 0xe5f00
 		RW_FWID_A@0xe7f00 0x100
 	}
-	RW_VPD@0x4e8000 0x8000
+	RW_VPD(PRESERVE)@0x4e8000 0x8000
 	RW_SECTION_B@0x4f0000 0xe8000 {
 		VBLOCK_B@0x0 0x2000
 		FW_MAIN_B(CBFS)@0x2000 0xe5f00
 		RW_FWID_B@0xe7f00 0x100
 	}
-	RW_ELOG@0x5d8000 0x1000
+	RW_ELOG(PRESERVE)@0x5d8000 0x1000
 	RW_UNUSED@0x5d9000 0x7000
 	RW_SHARED@0x5e0000 0x10000 {
 		SHARED_DATA@0x0 0x10000
 	}
-	RW_NVRAM@0x5f0000 0x10000
+	RW_NVRAM(PRESERVE)@0x5f0000 0x10000
 	RW_LEGACY(CBFS)@0x600000 0x200000
 }
diff --git a/src/mainboard/google/hatch/chromeos.fmd b/src/mainboard/google/hatch/chromeos.fmd
index e0007937d3..393ac808b5 100644
--- a/src/mainboard/google/hatch/chromeos.fmd
+++ b/src/mainboard/google/hatch/chromeos.fmd
@@ -23,18 +23,18 @@ FLASH@0xfe000000 0x2000000 {
 				RECOVERY_MRC_CACHE@0x0 0x10000
 				RW_MRC_CACHE@0x10000 0x20000
 			}
-			RW_ELOG@0x30000 0x4000
+			RW_ELOG(PRESERVE)@0x30000 0x4000
 			RW_SHARED@0x34000 0x4000 {
 				SHARED_DATA@0x0 0x2000
 				VBLOCK_DEV@0x2000 0x2000
 			}
-			RW_VPD@0x38000 0x2000
-			RW_NVRAM@0x3a000 0x6000
+			RW_VPD(PRESERVE)@0x38000 0x2000
+			RW_NVRAM(PRESERVE)@0x3a000 0x6000
 		}
 		# Make WP_RO region align with SPI vendor
 		# memory protected range specification.
 		WP_RO@0x1800000 0x400000 {
-			RO_VPD@0x0 0x4000
+			RO_VPD(PRESERVE)@0x0 0x4000
 			RO_SECTION@0x4000 0x3fc000 {
 				FMAP@0x0 0x800
 				RO_FRID@0x800 0x40
diff --git a/src/mainboard/google/jecht/chromeos.fmd b/src/mainboard/google/jecht/chromeos.fmd
index 215247f582..923c8ee18a 100644
--- a/src/mainboard/google/jecht/chromeos.fmd
+++ b/src/mainboard/google/jecht/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/google/kahlee/variants/baseboard/chromeos.fmd b/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd
index c5df90eb52..9d89a15d43 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd
+++ b/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd
@@ -14,20 +14,20 @@ FLASH@0xFF000000 0x1000000 {
 			FW_MAIN_B(CBFS)@0x10000 0x20DFC0
 			RW_FWID_B@0x21DFC0 0x40
 		}
-		RW_ELOG@0x45D000 0x4000
+		RW_ELOG(PRESERVE)@0x45D000 0x4000
 
 		RW_SHARED@0x461000 0x4000 {
 			SHARED_DATA@0x0 0x2000
 			VBLOCK_DEV@0x2000 0x2000
 		}
-		RW_VPD@0x465000 0x2000
-		RW_NVRAM@0x467000 0x5000
+		RW_VPD(PRESERVE)@0x465000 0x2000
+		RW_NVRAM(PRESERVE)@0x467000 0x5000
 		RW_UNUSED@0x46C000 0x14000
-		SMMSTORE@0x480000 0x20000
+		SMMSTORE(PRESERVE)@0x480000 0x20000
 		RW_LEGACY@0x4a0000 0x760000
 
 		WP_RO@0xC00000 0x400000 {
-			RO_VPD@0x0 0x4000
+			RO_VPD(PRESERVE)@0x0 0x4000
 			RO_UNUSED@0x4000 0x17B000
 			RO_SECTION@0x17F000 0x281000 {
 				FMAP@0x0 0x800
diff --git a/src/mainboard/google/kukui/chromeos.fmd b/src/mainboard/google/kukui/chromeos.fmd
index c563e08c1b..23e55766c6 100644
--- a/src/mainboard/google/kukui/chromeos.fmd
+++ b/src/mainboard/google/kukui/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x800000 {
 			GBB@0x1ed000 0x2f00
 			RO_FRID@0x1eff00 0x100
 		}
-		RO_VPD@0x1f0000 0x10000
+		RO_VPD(PRESERVE)@0x1f0000 0x10000
 	}
 	RW_SECTION_A@0x200000 0x78000 {
 		VBLOCK_A@0x0 0x2000
@@ -17,14 +17,14 @@ FLASH@0x0 0x800000 {
 	RW_SHARED@0x278000 0x2000 {
 		SHARED_DATA@0x0 0x2000
 	}
-	RW_NVRAM@0x27a000 0x2000
-	RW_ELOG@0x27c000 0x4000
+	RW_NVRAM(PRESERVE)@0x27a000 0x2000
+	RW_ELOG(PRESERVE)@0x27c000 0x4000
 	RW_SECTION_B@0x280000 0x78000 {
 		VBLOCK_B@0x0 0x2000
 		FW_MAIN_B(CBFS)@0x2000 0x75f00
 		RW_FWID_B@0x77f00 0x100
 	}
-	RW_VPD@0x2f8000 0x8000
-	SMMSTORE@0x300000 0x20000
+	RW_VPD(PRESERVE)@0x2f8000 0x8000
+	SMMSTORE(PRESERVE)@0x300000 0x20000
 	RW_LEGACY(CBFS)@0x320000 0xe0000
 }
diff --git a/src/mainboard/google/link/chromeos.fmd b/src/mainboard/google/link/chromeos.fmd
index 8a06dc2e48..3841445eec 100644
--- a/src/mainboard/google/link/chromeos.fmd
+++ b/src/mainboard/google/link/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/google/nyan/chromeos.fmd b/src/mainboard/google/nyan/chromeos.fmd
index 617ebbc35f..ebc6eb137b 100644
--- a/src/mainboard/google/nyan/chromeos.fmd
+++ b/src/mainboard/google/nyan/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x400000 {
 			GBB@0x101000 0xeef00
 			RO_FRID@0x1eff00 0x100
 		}
-		RO_VPD@0x1f0000 0x10000
+		RO_VPD(PRESERVE)@0x1f0000 0x10000
 	}
 	RW_SECTION_A@0x200000 0x78000 {
 		VBLOCK_A@0x0 0x2000
@@ -17,12 +17,12 @@ FLASH@0x0 0x400000 {
 	RW_SHARED@0x278000 0x4000 {
 		SHARED_DATA@0x0 0x4000
 	}
-	RW_ELOG@0x27c000 0x4000
+	RW_ELOG(PRESERVE)@0x27c000 0x4000
 	RW_SECTION_B@0x280000 0x78000 {
 		VBLOCK_B@0x0 0x2000
 		FW_MAIN_B(CBFS)@0x2000 0x75f00
 		RW_FWID_B@0x77f00 0x100
 	}
-	RW_VPD@0x2f8000 0x8000
+	RW_VPD(PRESERVE)@0x2f8000 0x8000
 	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/nyan_big/chromeos.fmd b/src/mainboard/google/nyan_big/chromeos.fmd
index 617ebbc35f..ebc6eb137b 100644
--- a/src/mainboard/google/nyan_big/chromeos.fmd
+++ b/src/mainboard/google/nyan_big/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x400000 {
 			GBB@0x101000 0xeef00
 			RO_FRID@0x1eff00 0x100
 		}
-		RO_VPD@0x1f0000 0x10000
+		RO_VPD(PRESERVE)@0x1f0000 0x10000
 	}
 	RW_SECTION_A@0x200000 0x78000 {
 		VBLOCK_A@0x0 0x2000
@@ -17,12 +17,12 @@ FLASH@0x0 0x400000 {
 	RW_SHARED@0x278000 0x4000 {
 		SHARED_DATA@0x0 0x4000
 	}
-	RW_ELOG@0x27c000 0x4000
+	RW_ELOG(PRESERVE)@0x27c000 0x4000
 	RW_SECTION_B@0x280000 0x78000 {
 		VBLOCK_B@0x0 0x2000
 		FW_MAIN_B(CBFS)@0x2000 0x75f00
 		RW_FWID_B@0x77f00 0x100
 	}
-	RW_VPD@0x2f8000 0x8000
+	RW_VPD(PRESERVE)@0x2f8000 0x8000
 	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/nyan_blaze/chromeos.fmd b/src/mainboard/google/nyan_blaze/chromeos.fmd
index 617ebbc35f..ebc6eb137b 100644
--- a/src/mainboard/google/nyan_blaze/chromeos.fmd
+++ b/src/mainboard/google/nyan_blaze/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x400000 {
 			GBB@0x101000 0xeef00
 			RO_FRID@0x1eff00 0x100
 		}
-		RO_VPD@0x1f0000 0x10000
+		RO_VPD(PRESERVE)@0x1f0000 0x10000
 	}
 	RW_SECTION_A@0x200000 0x78000 {
 		VBLOCK_A@0x0 0x2000
@@ -17,12 +17,12 @@ FLASH@0x0 0x400000 {
 	RW_SHARED@0x278000 0x4000 {
 		SHARED_DATA@0x0 0x4000
 	}
-	RW_ELOG@0x27c000 0x4000
+	RW_ELOG(PRESERVE)@0x27c000 0x4000
 	RW_SECTION_B@0x280000 0x78000 {
 		VBLOCK_B@0x0 0x2000
 		FW_MAIN_B(CBFS)@0x2000 0x75f00
 		RW_FWID_B@0x77f00 0x100
 	}
-	RW_VPD@0x2f8000 0x8000
+	RW_VPD(PRESERVE)@0x2f8000 0x8000
 	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/oak/chromeos.fmd b/src/mainboard/google/oak/chromeos.fmd
index 9c618e3cdf..df35976d00 100644
--- a/src/mainboard/google/oak/chromeos.fmd
+++ b/src/mainboard/google/oak/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x400000 {
 			GBB@0x101000 0xeef00
 			RO_FRID@0x1eff00 0x100
 		}
-		RO_VPD@0x1f0000 0x10000
+		RO_VPD(PRESERVE)@0x1f0000 0x10000
 	}
 	RW_SECTION_A@0x200000 0x78000 {
 		VBLOCK_A@0x0 0x2000
@@ -17,13 +17,13 @@ FLASH@0x0 0x400000 {
 	RW_SHARED@0x278000 0x2000 {
 		SHARED_DATA@0x0 0x2000
 	}
-	RW_NVRAM@0x27a000 0x2000
-	RW_ELOG@0x27c000 0x4000
+	RW_NVRAM(PRESERVE)@0x27a000 0x2000
+	RW_ELOG(PRESERVE)@0x27c000 0x4000
 	RW_SECTION_B@0x280000 0x78000 {
 		VBLOCK_B@0x0 0x2000
 		FW_MAIN_B(CBFS)@0x2000 0x75f00
 		RW_FWID_B@0x77f00 0x100
 	}
-	RW_VPD@0x2f8000 0x8000
+	RW_VPD(PRESERVE)@0x2f8000 0x8000
 	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/octopus/chromeos.fmd b/src/mainboard/google/octopus/chromeos.fmd
index 6088f0d97b..fbdafaa3a2 100644
--- a/src/mainboard/google/octopus/chromeos.fmd
+++ b/src/mainboard/google/octopus/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
@@ -12,20 +12,20 @@ FLASH 16M {
 		}
 	}
 	MISC_RW@0x400000 0x30000 {
-		RW_PRESERVE {
+		RW_PRESERVE(PRESERVE) {
 			UNIFIED_MRC_CACHE@0x0 0x21000 {
 				RECOVERY_MRC_CACHE@0x0 0x10000
 				RW_MRC_CACHE@0x10000 0x10000
 				RW_VAR_MRC_CACHE@0x20000 0x1000
 			}
 		}
-		RW_ELOG@0x21000 0x3000
+		RW_ELOG(PRESERVE)@0x21000 0x3000
 		RW_SHARED@0x24000 0x4000 {
 			SHARED_DATA@0x0 0x2000
 			VBLOCK_DEV@0x2000 0x2000
 		}
-		RW_VPD@0x28000 0x2000
-		RW_NVRAM@0x2a000 0x5000
+		RW_VPD(PRESERVE)@0x28000 0x2000
+		RW_NVRAM(PRESERVE)@0x2a000 0x5000
 		FPF_STATUS@0x2f000 0x1000
 	}
 	RW_SECTION_A@0x430000 0x480000 {
@@ -38,7 +38,7 @@ FLASH 16M {
 		FW_MAIN_B(CBFS)@0x10000 0x46ffc0
 		RW_FWID_B@0x47ffc0 0x40
 	}
-	SMMSTORE@0xd30000 0x40000
+	SMMSTORE(PRESERVE)@0xd30000 0x40000
 	RW_LEGACY(CBFS)@0xd70000 0x1c0000
 	BIOS_UNUSABLE@0xf30000 0x4f000
 	DEVICE_EXTENSION@0xf7f000 0x80000
diff --git a/src/mainboard/google/parrot/chromeos.fmd b/src/mainboard/google/parrot/chromeos.fmd
index 5f98229df8..6752888f03 100644
--- a/src/mainboard/google/parrot/chromeos.fmd
+++ b/src/mainboard/google/parrot/chromeos.fmd
@@ -15,18 +15,18 @@ 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_ENVIRONMENT@0x1f8000 0x4000
-		RW_VPD@0x1fc000 0x2000
+		RW_VPD(PRESERVE)@0x1fc000 0x2000
 		RW_UNUSED@0x1fe000 0x2000
-		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/google/peach_pit/chromeos.fmd b/src/mainboard/google/peach_pit/chromeos.fmd
index 5d6d456902..63bde335cb 100644
--- a/src/mainboard/google/peach_pit/chromeos.fmd
+++ b/src/mainboard/google/peach_pit/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x400000 {
 			GBB@0x101000 0xeef00
 			RO_FRID@0x1eff00 0x100
 		}
-		RO_VPD@0x1f0000 0x10000
+		RO_VPD(PRESERVE)@0x1f0000 0x10000
 	}
 	RW_SECTION_A@0x200000 0xf0000 {
 		VBLOCK_A@0x0 0x2000
@@ -19,7 +19,7 @@ FLASH@0x0 0x400000 {
 		FW_MAIN_B(CBFS)@0x2000 0xedf00
 		RW_FWID_B@0xeff00 0x100
 	}
-	RW_VPD@0x3f0000 0x8000
+	RW_VPD(PRESERVE)@0x3f0000 0x8000
 	RW_SHARED@0x3f8000 0x4000 {
 		SHARED_DATA@0x0 0x4000
 	}
diff --git a/src/mainboard/google/poppy/chromeos.fmd b/src/mainboard/google/poppy/chromeos.fmd
index 145fc7bffa..1cc4a61ae2 100644
--- a/src/mainboard/google/poppy/chromeos.fmd
+++ b/src/mainboard/google/poppy/chromeos.fmd
@@ -19,18 +19,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@0x800000 0x40000
+		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/google/rambi/chromeos.fmd b/src/mainboard/google/rambi/chromeos.fmd
index 215247f582..923c8ee18a 100644
--- a/src/mainboard/google/rambi/chromeos.fmd
+++ b/src/mainboard/google/rambi/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/google/reef/chromeos.fmd b/src/mainboard/google/reef/chromeos.fmd
index f601adc5e3..87eb4e76dc 100644
--- a/src/mainboard/google/reef/chromeos.fmd
+++ b/src/mainboard/google/reef/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
@@ -17,13 +17,13 @@ FLASH 16M {
 			RW_MRC_CACHE@0x10000 0x10000
 			RW_VAR_MRC_CACHE@0x20000 0x1000
 		}
-		RW_ELOG@0x21000 0x3000
+		RW_ELOG(PRESERVE)@0x21000 0x3000
 		RW_SHARED@0x24000 0x4000 {
 			SHARED_DATA@0x0 0x2000
 			VBLOCK_DEV@0x2000 0x2000
 		}
-		RW_VPD@0x28000 0x2000
-		RW_NVRAM@0x2a000 0x5000
+		RW_VPD(PRESERVE)@0x28000 0x2000
+		RW_NVRAM(PRESERVE)@0x2a000 0x5000
 		FPF_STATUS@0x2f000 0x1000
 	}
 	RW_SECTION_A@0x430000 0x480000 {
@@ -36,7 +36,7 @@ FLASH 16M {
 		FW_MAIN_B(CBFS)@0x10000 0x46ffc0
 		RW_FWID_B@0x47ffc0 0x40
 	}
-	SMMSTORE@0xd30000 0x40000
+	SMMSTORE(PRESERVE)@0xd30000 0x40000
 	RW_LEGACY(CBFS)@0xd70000 0x1c0000
 	BIOS_UNUSABLE@0xf30000 0x4f000
 	DEVICE_EXTENSION@0xf7f000 0x80000
diff --git a/src/mainboard/google/sarien/chromeos.fmd b/src/mainboard/google/sarien/chromeos.fmd
index db0af0f0aa..ece0eda099 100644
--- a/src/mainboard/google/sarien/chromeos.fmd
+++ b/src/mainboard/google/sarien/chromeos.fmd
@@ -2,9 +2,9 @@ FLASH@0xfe000000 0x2000000 {
 	SI_ALL@0x0 0x400000 {
 		SI_DESC@0x0 0x1000
 		SI_EC@0x1000 0x100000
-		SI_GBE@0x101000 0x2000
+		SI_GBE(PRESERVE)@0x101000 0x2000
 		SI_ME@0x103000 0x2f9000
-		SI_PDR@0x3fc000 0x4000
+		SI_PDR(PRESERVE)@0x3fc000 0x4000
 	}
 	SI_BIOS@0x400000 0x1c00000 {
 		RW_DIAG@0x0 0x12d0000 {
@@ -26,16 +26,16 @@ 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
 		}
 		WP_RO@0x1800000 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/google/slippy/chromeos.fmd b/src/mainboard/google/slippy/chromeos.fmd
index 215247f582..923c8ee18a 100644
--- a/src/mainboard/google/slippy/chromeos.fmd
+++ b/src/mainboard/google/slippy/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/google/smaug/chromeos.fmd b/src/mainboard/google/smaug/chromeos.fmd
index 88809ab1e8..4b1ba1951b 100644
--- a/src/mainboard/google/smaug/chromeos.fmd
+++ b/src/mainboard/google/smaug/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x1000000 {
 			GBB@0x401000 0xeef00
 			RO_FRID@0x4eff00 0x100
 		}
-		RO_VPD@0x4f0000 0x10000
+		RO_VPD(PRESERVE)@0x4f0000 0x10000
 	}
 	RW_SECTION_A@0x500000 0x500000 {
 		VBLOCK_A@0x0 0x2000
@@ -21,7 +21,7 @@ FLASH@0x0 0x1000000 {
 	}
 	RW_SHARED@0xf00000 0x4000
 	SHARED_DATA@0xf04000 0x4000
-	RW_ELOG@0xf08000 0x4000
-	RW_VPD@0xf0c000 0x8000
-	RW_NVRAM@0xf20000 0x10000
+	RW_ELOG(PRESERVE)@0xf08000 0x4000
+	RW_VPD(PRESERVE)@0xf0c000 0x8000
+	RW_NVRAM(PRESERVE)@0xf20000 0x10000
 }
diff --git a/src/mainboard/google/storm/chromeos.fmd b/src/mainboard/google/storm/chromeos.fmd
index a9bdd7b541..3a55bdcae4 100644
--- a/src/mainboard/google/storm/chromeos.fmd
+++ b/src/mainboard/google/storm/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x800000 {
 			GBB@0x301000 0xdef00
 			RO_FRID@0x3dff00 0x100
 		}
-		RO_VPD@0x3e0000 0x20000
+		RO_VPD(PRESERVE)@0x3e0000 0x20000
 	}
 	RW_SECTION_A@0x400000 0x160000 {
 		VBLOCK_A@0x0 0x2000
@@ -26,8 +26,8 @@ FLASH@0x0 0x800000 {
 		FW_MAIN_B(CBFS)@0x2000 0x14df00
 		RW_FWID_B@0x14ff00 0x100
 	}
-	RW_VPD@0x6e0000 0x8000
-	RW_ELOG@0x6e8000 0x8000
-	RW_NVRAM@0x6f0000 0x10000
+	RW_VPD(PRESERVE)@0x6e0000 0x8000
+	RW_ELOG(PRESERVE)@0x6e8000 0x8000
+	RW_NVRAM(PRESERVE)@0x6f0000 0x10000
 	RW_LEGACY(CBFS)@0x700000 0x100000
 }
diff --git a/src/mainboard/google/stout/chromeos.fmd b/src/mainboard/google/stout/chromeos.fmd
index 14c91d7967..93048a37ec 100644
--- a/src/mainboard/google/stout/chromeos.fmd
+++ b/src/mainboard/google/stout/chromeos.fmd
@@ -15,18 +15,18 @@ 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_ENVIRONMENT@0x1f8000 0x4000
-		RW_VPD@0x1fc000 0x2000
+		RW_VPD(PRESERVE)@0x1fc000 0x2000
 		RW_UNUSED@0x1fe000 0x2000
-		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/google/urara/chromeos.fmd b/src/mainboard/google/urara/chromeos.fmd
index 7898cf5686..4bc0db4dc6 100644
--- a/src/mainboard/google/urara/chromeos.fmd
+++ b/src/mainboard/google/urara/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x200000 {
 			GBB@0xe1000 0xef00
 			RO_FRID@0xeff00 0x100
 		}
-		RO_VPD@0xf0000 0x10000
+		RO_VPD(PRESERVE)@0xf0000 0x10000
 	}
 	RW_SECTION_A@0x100000 0x70000 {
 		VBLOCK_A@0x0 0x2000
@@ -21,12 +21,12 @@ FLASH@0x0 0x200000 {
 		RW_GPT_PRIMARY@0x0 0x1000
 		RW_GPT_SECONDARY@0x1000 0x1000
 	}
-	RW_ELOG@0x174000 0x4000
-	RW_VPD@0x178000 0x8000
+	RW_ELOG(PRESERVE)@0x174000 0x4000
+	RW_VPD(PRESERVE)@0x178000 0x8000
 	RW_SECTION_B@0x180000 0x70000 {
 		VBLOCK_B@0x0 0x2000
 		FW_MAIN_B(CBFS)@0x2000 0x6df00
 		RW_FWID_B@0x6ff00 0x100
 	}
-	RW_NVRAM@0x1f0000 0x10000
+	RW_NVRAM(PRESERVE)@0x1f0000 0x10000
 }
diff --git a/src/mainboard/google/veyron/chromeos.fmd b/src/mainboard/google/veyron/chromeos.fmd
index 617ebbc35f..ebc6eb137b 100644
--- a/src/mainboard/google/veyron/chromeos.fmd
+++ b/src/mainboard/google/veyron/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x400000 {
 			GBB@0x101000 0xeef00
 			RO_FRID@0x1eff00 0x100
 		}
-		RO_VPD@0x1f0000 0x10000
+		RO_VPD(PRESERVE)@0x1f0000 0x10000
 	}
 	RW_SECTION_A@0x200000 0x78000 {
 		VBLOCK_A@0x0 0x2000
@@ -17,12 +17,12 @@ FLASH@0x0 0x400000 {
 	RW_SHARED@0x278000 0x4000 {
 		SHARED_DATA@0x0 0x4000
 	}
-	RW_ELOG@0x27c000 0x4000
+	RW_ELOG(PRESERVE)@0x27c000 0x4000
 	RW_SECTION_B@0x280000 0x78000 {
 		VBLOCK_B@0x0 0x2000
 		FW_MAIN_B(CBFS)@0x2000 0x75f00
 		RW_FWID_B@0x77f00 0x100
 	}
-	RW_VPD@0x2f8000 0x8000
+	RW_VPD(PRESERVE)@0x2f8000 0x8000
 	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/veyron_mickey/chromeos.fmd b/src/mainboard/google/veyron_mickey/chromeos.fmd
index fc7cf3b80f..76ab2c321f 100644
--- a/src/mainboard/google/veyron_mickey/chromeos.fmd
+++ b/src/mainboard/google/veyron_mickey/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x400000 {
 			GBB@0x181000 0x6ef00
 			RO_FRID@0x1eff00 0x100
 		}
-		RO_VPD@0x1f0000 0x10000
+		RO_VPD(PRESERVE)@0x1f0000 0x10000
 	}
 	RW_SECTION_A@0x200000 0x78000 {
 		VBLOCK_A@0x0 0x2000
@@ -17,13 +17,13 @@ FLASH@0x0 0x400000 {
 	RW_SHARED@0x278000 0x2000 {
 		SHARED_DATA@0x0 0x2000
 	}
-	RW_NVRAM@0x27a000 0x2000
-	RW_ELOG@0x27c000 0x4000
+	RW_NVRAM(PRESERVE)@0x27a000 0x2000
+	RW_ELOG(PRESERVE)@0x27c000 0x4000
 	RW_SECTION_B@0x280000 0x78000 {
 		VBLOCK_B@0x0 0x2000
 		FW_MAIN_B(CBFS)@0x2000 0x75f00
 		RW_FWID_B@0x77f00 0x100
 	}
-	RW_VPD@0x2f8000 0x8000
+	RW_VPD(PRESERVE)@0x2f8000 0x8000
 	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/veyron_rialto/chromeos.fmd b/src/mainboard/google/veyron_rialto/chromeos.fmd
index 9c618e3cdf..df35976d00 100644
--- a/src/mainboard/google/veyron_rialto/chromeos.fmd
+++ b/src/mainboard/google/veyron_rialto/chromeos.fmd
@@ -7,7 +7,7 @@ FLASH@0x0 0x400000 {
 			GBB@0x101000 0xeef00
 			RO_FRID@0x1eff00 0x100
 		}
-		RO_VPD@0x1f0000 0x10000
+		RO_VPD(PRESERVE)@0x1f0000 0x10000
 	}
 	RW_SECTION_A@0x200000 0x78000 {
 		VBLOCK_A@0x0 0x2000
@@ -17,13 +17,13 @@ FLASH@0x0 0x400000 {
 	RW_SHARED@0x278000 0x2000 {
 		SHARED_DATA@0x0 0x2000
 	}
-	RW_NVRAM@0x27a000 0x2000
-	RW_ELOG@0x27c000 0x4000
+	RW_NVRAM(PRESERVE)@0x27a000 0x2000
+	RW_ELOG(PRESERVE)@0x27c000 0x4000
 	RW_SECTION_B@0x280000 0x78000 {
 		VBLOCK_B@0x0 0x2000
 		FW_MAIN_B(CBFS)@0x2000 0x75f00
 		RW_FWID_B@0x77f00 0x100
 	}
-	RW_VPD@0x2f8000 0x8000
+	RW_VPD(PRESERVE)@0x2f8000 0x8000
 	RW_LEGACY(CBFS)@0x300000 0x100000
 }
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
diff --git a/src/mainboard/ocp/wedge100s/vboot-ro.fmd b/src/mainboard/ocp/wedge100s/vboot-ro.fmd
index a591bae973..1413bbff29 100644
--- a/src/mainboard/ocp/wedge100s/vboot-ro.fmd
+++ b/src/mainboard/ocp/wedge100s/vboot-ro.fmd
@@ -6,10 +6,10 @@ FLASH 16M {
 	SI_BIOS@0x800000 0x800000 {
 		MISC_RW@0x0 0x20000 {
 			RW_MRC_CACHE@0x0 0x10000
-			RW_VPD@0x010000 0x4000
+			RW_VPD(PRESERVE)@0x010000 0x4000
 		}
 		WP_RO@0x020000 0x7e0000 {
-			RO_VPD@0x0 0x4000
+			RO_VPD(PRESERVE)@0x0 0x4000
 			RO_SECTION@0x4000 0x7dc000 {
 				FMAP@0x0 0x800
 				RO_FRID@0x800 0x40
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
diff --git a/src/mainboard/samsung/lumpy/chromeos.fmd b/src/mainboard/samsung/lumpy/chromeos.fmd
index 5ac32447ec..9852a2209c 100644
--- a/src/mainboard/samsung/lumpy/chromeos.fmd
+++ b/src/mainboard/samsung/lumpy/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/samsung/stumpy/chromeos.fmd b/src/mainboard/samsung/stumpy/chromeos.fmd
index 5ac32447ec..9852a2209c 100644
--- a/src/mainboard/samsung/stumpy/chromeos.fmd
+++ b/src/mainboard/samsung/stumpy/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