6 files changed, 12 insertions, 12 deletions

diff --git a/src/mainboard/google/drallion/chromeos.fmd b/src/mainboard/google/drallion/chromeos.fmd
index 8bab919c6d..6e9170ed41 100644
--- a/src/mainboard/google/drallion/chromeos.fmd
+++ b/src/mainboard/google/drallion/chromeos.fmd
@@ -40,8 +40,8 @@ FLASH@0xfe000000 0x2000000 {
 				FMAP@0x0 0x800
 				RO_FRID@0x800 0x40
 				RO_FRID_PAD@0x840 0x7c0
-				GBB@0x1000 0xef000
-				COREBOOT(CBFS)@0xf0000 0x300000
+				GBB@0x1000 0x3000
+				COREBOOT(CBFS)@0x4000 0x3ec000
 			}
 		}
 	}
diff --git a/src/mainboard/google/hatch/chromeos-16MiB.fmd b/src/mainboard/google/hatch/chromeos-16MiB.fmd
index eb92bb0a01..8880a4f9fe 100644
--- a/src/mainboard/google/hatch/chromeos-16MiB.fmd
+++ b/src/mainboard/google/hatch/chromeos-16MiB.fmd
@@ -35,8 +35,8 @@ FLASH@0xff000000 0x1000000 {
 				FMAP@0x0 0x800
 				RO_FRID@0x800 0x40
 				RO_FRID_PAD@0x840 0x7c0
-				GBB@0x1000 0xef000
-				COREBOOT(CBFS)@0xf0000 0x30c000
+				GBB@0x1000 0x3000
+				COREBOOT(CBFS)@0x4000 0x3f8000
 			}
 		}
 	}
diff --git a/src/mainboard/google/hatch/chromeos.fmd b/src/mainboard/google/hatch/chromeos.fmd
index 45dbc81716..8368b0a44b 100644
--- a/src/mainboard/google/hatch/chromeos.fmd
+++ b/src/mainboard/google/hatch/chromeos.fmd
@@ -39,8 +39,8 @@ FLASH@0xfe000000 0x2000000 {
 				FMAP@0x0 0x800
 				RO_FRID@0x800 0x40
 				RO_FRID_PAD@0x840 0x7c0
-				GBB@0x1000 0xef000
-				COREBOOT(CBFS)@0xf0000 0x30c000
+				GBB@0x1000 0x3000
+				COREBOOT(CBFS)@0x4000 0x3f8000
 			}
 		}
 	}
diff --git a/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd b/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd
index b746545488..d7d0a886d3 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd
+++ b/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd
@@ -33,8 +33,8 @@ FLASH@0xFF000000 0x1000000 {
 				FMAP@0x0 0x800
 				RO_FRID@0x800 0x40
 				RO_FRID_PAD@0x840 0x7c0
-				GBB@0x1000 0x70000
-				COREBOOT(CBFS)@0x71000 0x210000
+				GBB@0x1000 0x3000
+				COREBOOT(CBFS)@0x4000 0x27d000
 			}
 		}
 	}
diff --git a/src/mainboard/google/octopus/chromeos.fmd b/src/mainboard/google/octopus/chromeos.fmd
index fbdafaa3a2..332465ae19 100644
--- a/src/mainboard/google/octopus/chromeos.fmd
+++ b/src/mainboard/google/octopus/chromeos.fmd
@@ -7,8 +7,8 @@ FLASH 16M {
 			FMAP@0x0 0x800
 			RO_FRID@0x800 0x40
 			RO_FRID_PAD@0x840 0x7c0
-			COREBOOT(CBFS)@0x1000 0x1bb000
-			GBB@0x1bc000 0x40000
+			COREBOOT(CBFS)@0x1000 0x1f8000
+			GBB@0x1f9000 0x3000
 		}
 	}
 	MISC_RW@0x400000 0x30000 {
diff --git a/src/mainboard/google/sarien/chromeos.fmd b/src/mainboard/google/sarien/chromeos.fmd
index ece0eda099..65a915a2c0 100644
--- a/src/mainboard/google/sarien/chromeos.fmd
+++ b/src/mainboard/google/sarien/chromeos.fmd
@@ -41,8 +41,8 @@ FLASH@0xfe000000 0x2000000 {
 				FMAP@0x0 0x800
 				RO_FRID@0x800 0x40
 				RO_FRID_PAD@0x840 0x7c0
-				GBB@0x1000 0xef000
-				COREBOOT(CBFS)@0xf0000 0x300000
+				GBB@0x1000 0x3000
+				COREBOOT(CBFS)@0x4000 0x3ec000
 			}
 		}
 	}