reorganize x86 fmaps

- obsolete alex fmap is not updated.
- drop unused shared-section, ro-recovery, ro-data
- make coreboot CBFS 1MB
- make GBB 512KB
- align RW-A and RW-B to 1MB
- increase rw-mrc-cache to 64KB for RW level wearing

BUG=chrome-os-partner:7172
TEST=boot coreboot on Stumpy and see it still booting
Signed-off-by: Stefan Reinauer <reinauer@google.com>

Change-Id: I4da3b6bf1023bacadaa9b2e07eb07500247e120c
Reviewed-on: https://gerrit.chromium.org/gerrit/12704
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Tested-by: Stefan Reinauer <reinauer@chromium.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>

1 files changed, 20 insertions, 45 deletions

diff --git a/board/chromebook-x86/coreboot/flashmap-8mb.dtsi b/board/chromebook-x86/coreboot/flashmap-8mb.dtsi
index 1c9e8921b8..c369c70a91 100644
--- a/board/chromebook-x86/coreboot/flashmap-8mb.dtsi
+++ b/board/chromebook-x86/coreboot/flashmap-8mb.dtsi
@@ -64,16 +64,16 @@
 		 */
 		coreboot-extra@0 {
 			label = "coreboot-extra";
-			reg = <0x00180000 0x0027f000>;
+			reg = <0x00180000 0x0026b000>;
 			type = "wiped";
 			wipe-value = [ff];
 		};
 
-		/* ---- Section: Rewritable MRC cache 4KB ---- */
+		/* ---- Section: Rewritable MRC cache 64 KB ---- */
 		rw-mrc-cache@0 {
 			label = "rw-mrc-cache";
 			/* Alignment: 4k (for updating) */
-			reg = <0x003ff000 0x00001000>;
+			reg = <0x003eb000 0x00010000>;
 			type = "wiped";
 			wipe-value = [ff];
 		};
@@ -82,31 +82,11 @@
 		rw-vpd@0 {
 			label = "rw-vpd";
 			/* Alignment: 4k (for updating) */
-			reg = <0x00400000 0x00001000>;
+			reg = <0x003fb000 0x00001000>;
 			type = "wiped";
 			wipe-value = [ff];
 		};
 
-		/* ---- Section: Rewritable shared 16 KB---- */
-		shared-section@0 {
-			/*
-			 * Alignment: 4k (for updating).
-			 * Anything in this range may be updated in recovery.
-			 */
-			label = "rw-shared";
-			reg = <0x00401000 0x0001b000>;
-		};
-		shared-data@0 {
-			label = "shared-data";
-			/*
-			 * Alignment: 4k (for random read/write).
-			 * RW firmware can put calibration data here.
-			 */
-			reg = <0x00401000 0x0001b000>;
-			type = "wiped";
-			wipe-value = [00];
-		};
-
 		/* ---- Section: Rewritable private 16 KB---- */
 		dev-cfg@0 {
 			label = "dev-cfg";
@@ -114,7 +94,7 @@
 			 * Alignment: 4k, and must occupy bottom of U-Boot
 			 * firmware -- check CONFIG_ENV_OFFSET
 			 */
-			reg = <0x0041c000 0x00004000>;
+			reg = <0x003fc000 0x00004000>;
 
 			/*
 			 * We could put the dev environment here, but U-Boot has
@@ -129,7 +109,7 @@
 		rw-a@0 {
 			label = "rw-section-a";
 			/* Alignment: 4k (for updating) */
-			reg = <0x00420000 0x000f0000>;
+			reg = <0x00400000 0x00100000>;
 		};
 		rw-a-vblock@0 {
 			label = "vblock-a";
@@ -137,7 +117,7 @@
 			 * Alignment: 4k (for updating) and must be in start of
 			 * each RW_SECTION.
 			 */
-			reg = <0x00420000 0x00010000>;
+			reg = <0x00400000 0x00010000>;
 			type = "keyblock boot";
 			keyblock = "firmware.keyblock";
 			signprivate = "firmware_data_key.vbprivk";
@@ -148,13 +128,13 @@
 		rw-a-boot@0 {
 			/* Alignment: no requirement (yet). */
 			label = "fw-main-a";
-			reg = <0x00430000 0x000dffc0>;
+			reg = <0x00410000 0x000effc0>;
 			type = "blob boot";
 		};
 		rw-a-firmware-id@0 {
 			/* Alignment: no requirement. */
 			label = "rw-fwid-a";
-			reg = <0x0050ffc0 0x00000040>;
+			reg = <0x004fffc0 0x00000040>;
 			read-only;
 			type = "blobstring fwid";
 		};
@@ -163,7 +143,7 @@
 		rw-b@0 {
 			label = "rw-section-b";
 			/* Alignment: 4k (for updating) */
-			reg = <0x00510000 0x000f0000>;
+			reg = <0x00500000 0x00100000>;
 		};
 		rw-b-vblock@0 {
 			label = "vblock-b";
@@ -171,7 +151,7 @@
 			 * Alignment: 4k (for updating) and must be in start of
 			 * each RW_SECTION.
 			 */
-			reg = <0x00510000 0x00010000>;
+			reg = <0x00500000 0x00010000>;
 			type = "keyblock boot";
 			keyblock = "firmware.keyblock";
 			signprivate = "firmware_data_key.vbprivk";
@@ -182,7 +162,7 @@
 		rw-b-boot@0 {
 			label = "fw-main-b";
 			/* Alignment: no requirement (yet). */
-			reg = <0x00520000 0x000dffc0>;
+			reg = <0x00510000 0x000effc0>;
 			type = "blob boot";
 		};
 		rw-b-firmware-id@0 {
@@ -198,7 +178,7 @@
 			label = "ro-vpd";
 
 			/* VPD offset must be aligned to 4K bytes */
-			reg = <0x00600000 0x00020000>;
+			reg = <0x00600000 0x00020000>; /* 128 KB */
 			read-only;
 			type = "wiped";
 			wipe-value = [ff];
@@ -232,29 +212,24 @@
 			read-only;
 			type = "blobstring fwid";
 		};
-		ro-recovery@0 {
-			/* Deprecated section */
-			label = "recovery";
-			reg = <0x00680000 0x00080000>;
-			read-only;
-		};
-		ro-data@0 {
-		        /* Currently unused, simply for padding */
-			label = "ro-data";
-			reg = <0x00700000 0x00040000>;
+		ro-padding@0 {
+			label = "ro-padding";
+			reg = <0x00670840 0x0000f7c0>;
 			read-only;
+			type = "wiped";
+			wipe-value = [ff];
 		};
 		ro-gbb@0 {
 			label = "gbb";
 
 			/* GBB offset must be aligned to 4K bytes */
-			reg = <0x00740000 0x00040000>;
+			reg = <0x00680000 0x00080000>; /* 512 KB */
 			read-only;
 			type = "blob gbb";
 		};
 		ro-boot@0 {
 			label = "boot-stub";
-			reg = <0x00780000 0x00080000>; /* 512 KB */
+			reg = <0x00700000 0x00100000>; /* 1024 KB */
 			read-only;
 			type = "blob signed";
 		};