9 files changed, 8 insertions, 26 deletions
diff --git a/src/mainboard/google/brox/chromeos.fmd b/src/mainboard/google/brox/chromeos.fmd
index 59b24dd4a2..65ceba7b14 100644
--- a/src/mainboard/google/brox/chromeos.fmd
+++ b/src/mainboard/google/brox/chromeos.fmd
@@ -14,7 +14,6 @@ FLASH 32M {
 			VBLOCK_A 64K
 			FW_MAIN_A(CBFS)
 			RW_FWID_A 64
-			ME_RW_A(CBFS) 3008K
 		}
 		RW_LEGACY(CBFS) 2M
 		RW_MISC 1M {
@@ -43,7 +42,6 @@ FLASH 32M {
 			VBLOCK_B 64K
 			FW_MAIN_B(CBFS)
 			RW_FWID_B 64
-			ME_RW_B(CBFS) 3008K
 		}
 		# Make WP_RO region align with SPI vendor
 		# memory protected range specification.
diff --git a/src/mainboard/google/brya/chromeos-nissa-16MiB-debugfsp.fmd b/src/mainboard/google/brya/chromeos-nissa-16MiB-debugfsp.fmd
index ee92f2af4f..205f3dd1e5 100644
--- a/src/mainboard/google/brya/chromeos-nissa-16MiB-debugfsp.fmd
+++ b/src/mainboard/google/brya/chromeos-nissa-16MiB-debugfsp.fmd
@@ -8,7 +8,6 @@ FLASH 16M {
 			VBLOCK_A 8K
 			FW_MAIN_A(CBFS)
 			RW_FWID_A 64
-			ME_RW_A(CBFS) 1434K
 		}
 		RW_MISC 152K {
 			UNIFIED_MRC_CACHE(PRESERVE) 128K {
@@ -26,7 +25,6 @@ FLASH 16M {
 			VBLOCK_B 8K
 			FW_MAIN_B(CBFS)
 			RW_FWID_B 64
-			ME_RW_B(CBFS) 1434K
 		}
 		# Make WP_RO region align with SPI vendor
 		# memory protected range specification.
diff --git a/src/mainboard/google/brya/chromeos-nissa-16MiB.fmd b/src/mainboard/google/brya/chromeos-nissa-16MiB.fmd
index af69207613..037812a83f 100644
--- a/src/mainboard/google/brya/chromeos-nissa-16MiB.fmd
+++ b/src/mainboard/google/brya/chromeos-nissa-16MiB.fmd
@@ -8,7 +8,6 @@ FLASH 16M {
 			VBLOCK_A 8K
 			FW_MAIN_A(CBFS)
 			RW_FWID_A 64
-			ME_RW_A(CBFS) 1434K
 		}
 		RW_LEGACY(CBFS) 1M
 		RW_MISC 152K {
@@ -27,7 +26,6 @@ FLASH 16M {
 			VBLOCK_B 8K
 			FW_MAIN_B(CBFS)
 			RW_FWID_B 64
-			ME_RW_B(CBFS) 1434K
 		}
 		# Make WP_RO region align with SPI vendor
 		# memory protected range specification.
diff --git a/src/mainboard/google/brya/chromeos-nissa-32MiB.fmd b/src/mainboard/google/brya/chromeos-nissa-32MiB.fmd
index 1662600e70..00e7997819 100644
--- a/src/mainboard/google/brya/chromeos-nissa-32MiB.fmd
+++ b/src/mainboard/google/brya/chromeos-nissa-32MiB.fmd
@@ -8,7 +8,6 @@ FLASH 32M {
 			VBLOCK_A 8K
 			FW_MAIN_A(CBFS)
 			RW_FWID_A 64
-			ME_RW_A(CBFS) 1434K
 		}
 		RW_LEGACY(CBFS) 1M
 		RW_MISC 152K {
@@ -33,7 +32,6 @@ FLASH 32M {
 			VBLOCK_B 8K
 			FW_MAIN_B(CBFS)
 			RW_FWID_B 64
-			ME_RW_B(CBFS) 1434K
 		}
 		# RW UNUSED Region 2.
 		RW_UNUSED_2 7912K
diff --git a/src/mainboard/google/brya/chromeos-serger.fmd b/src/mainboard/google/brya/chromeos-serger.fmd
index 72c6429672..72849361e7 100644
--- a/src/mainboard/google/brya/chromeos-serger.fmd
+++ b/src/mainboard/google/brya/chromeos-serger.fmd
@@ -14,7 +14,6 @@ FLASH 32M {
 			VBLOCK_A 64K
 			FW_MAIN_A(CBFS)
 			RW_FWID_A 64
-			ME_RW_A(CBFS) 3008K
 		}
 		RW_LEGACY(CBFS) 2M
 		RW_MISC 1M {
@@ -43,7 +42,6 @@ FLASH 32M {
 			VBLOCK_B 64K
 			FW_MAIN_B(CBFS)
 			RW_FWID_B 64
-			ME_RW_B(CBFS) 3008K
 		}
 		# Make WP_RO region align with SPI vendor
 		# memory protected range specification.
diff --git a/src/mainboard/google/brya/chromeos.fmd b/src/mainboard/google/brya/chromeos.fmd
index e44538395a..ac7e51ebc1 100644
--- a/src/mainboard/google/brya/chromeos.fmd
+++ b/src/mainboard/google/brya/chromeos.fmd
@@ -14,7 +14,6 @@ FLASH 32M {
 			VBLOCK_A 64K
 			FW_MAIN_A(CBFS)
 			RW_FWID_A 64
-			ME_RW_A(CBFS) 3008K
 		}
 		RW_LEGACY(CBFS) 2M
 		RW_MISC 1M {
@@ -43,7 +42,6 @@ FLASH 32M {
 			VBLOCK_B 64K
 			FW_MAIN_B(CBFS)
 			RW_FWID_B 64
-			ME_RW_B(CBFS) 3008K
 		}
 		# Make WP_RO region align with SPI vendor
 		# memory protected range specification.
diff --git a/src/mainboard/google/dedede/chromeos-dedede-16MiB.fmd b/src/mainboard/google/dedede/chromeos-dedede-16MiB.fmd
index ade48661c5..0e21c4c91b 100644
--- a/src/mainboard/google/dedede/chromeos-dedede-16MiB.fmd
+++ b/src/mainboard/google/dedede/chromeos-dedede-16MiB.fmd
@@ -7,15 +7,13 @@ FLASH@0xff000000 0x1000000 {
 		RW_LEGACY(CBFS)@0x0 0x100000
 		RW_SECTION_A@0x100000 0x3a4800 {
 			VBLOCK_A@0x0 0x2000
-			FW_MAIN_A(CBFS)@0x2000 0x2127c0
-			RW_FWID_A@0x2147c0 0x40
-			ME_RW_A(CBFS)@0x214800 0x190000
+			FW_MAIN_A(CBFS)@0x2000 0x3a27c0
+			RW_FWID_A@0x3a47c0 0x40
 		}
 		RW_SECTION_B@0x4a4800 0x3a4800 {
 			VBLOCK_B@0x0 0x2000
-			FW_MAIN_B(CBFS)@0x2000 0x2127c0
-			RW_FWID_B@0x2147c0 0x40
-			ME_RW_B(CBFS)@0x214800 0x190000
+			FW_MAIN_B(CBFS)@0x2000 0x3a27c0
+			RW_FWID_B@0x3a47c0 0x40
 		}
 		RW_MISC@0x849000 0x36000 {
 			UNIFIED_MRC_CACHE(PRESERVE)@0x0 0x30000 {
diff --git a/src/mainboard/google/dedede/chromeos-dedede-32MiB.fmd b/src/mainboard/google/dedede/chromeos-dedede-32MiB.fmd
index 4b318610cd..60ea3ded64 100644
--- a/src/mainboard/google/dedede/chromeos-dedede-32MiB.fmd
+++ b/src/mainboard/google/dedede/chromeos-dedede-32MiB.fmd
@@ -10,15 +10,13 @@ FLASH@0xfe000000 0x2000000 {
 		RW_LEGACY(CBFS)@0x0 0xf00000
 		RW_SECTION_A@0xf00000 0x3e0000 {
 			VBLOCK_A@0x0 0x10000
-			FW_MAIN_A(CBFS)@0x10000 0x23ffc0
-			RW_FWID_A@0x24ffc0 0x40
-			ME_RW_A(CBFS)@0x250000 0x190000
+			FW_MAIN_A(CBFS)@0x10000 0x3cffc0
+			RW_FWID_A@0x3dffc0 0x40
 		}
 		RW_SECTION_B@0x12e0000 0x3e0000 {
 			VBLOCK_B@0x0 0x10000
-			FW_MAIN_B(CBFS)@0x10000 0x23ffc0
-			RW_FWID_B@0x24ffc0 0x40
-			ME_RW_B(CBFS)@0x250000 0x190000
+			FW_MAIN_B(CBFS)@0x10000 0x3cffc0
+			RW_FWID_B@0x3dffc0 0x40
 		}
 		RW_MISC@0x16c0000 0x40000 {
 			UNIFIED_MRC_CACHE(PRESERVE)@0x0 0x30000 {
diff --git a/src/mainboard/google/volteer/chromeos.fmd b/src/mainboard/google/volteer/chromeos.fmd
index 6f833fefdc..1e3e77b3f7 100644
--- a/src/mainboard/google/volteer/chromeos.fmd
+++ b/src/mainboard/google/volteer/chromeos.fmd
@@ -8,7 +8,6 @@ FLASH 32M {
 			VBLOCK_A 64K
 			FW_MAIN_A(CBFS)
 			RW_FWID_A 64
-			ME_RW_A(CBFS) 3M
 		}
 		RW_LEGACY(CBFS) 2M
 		RW_MISC 1M {
@@ -32,7 +31,6 @@ FLASH 32M {
 			VBLOCK_B 64K
 			FW_MAIN_B(CBFS)
 			RW_FWID_B 64
-			ME_RW_B(CBFS) 3M
 		}
 		# Make WP_RO region align with SPI vendor
 		# memory protected range specification.