gizmo: Increase size of fw-main sections in fmap
Remove some excess space from VPD. This board has only a
2 MB flash chip, so some sections are being tightly fit.
BUG=None
BRANCH=none
TEST=emerge chromeos-bootimage
Change-Id: I85112a859895be4998d65874e71d738191884832
Signed-off-by: Marcelo Povoa <marcelogp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/191548
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
diff --git a/board/gizmo/defconfig b/board/gizmo/defconfig
index 26e19ae..62d000e 100644
--- a/board/gizmo/defconfig
+++ b/board/gizmo/defconfig
@@ -5,7 +5,7 @@
CONFIG_BOARD="gizmo"
# Image
-CONFIG_FMAP_OFFSET=0x000c0000
+CONFIG_FMAP_OFFSET=0x000c8000
# Vboot
CONFIG_OPROM_MATTERS=y
diff --git a/board/gizmo/fmap.dts b/board/gizmo/fmap.dts
index a900c9d..9f08b92 100644
--- a/board/gizmo/fmap.dts
+++ b/board/gizmo/fmap.dts
@@ -19,7 +19,7 @@
rw-a {
label = "rw-section-a";
/* Alignment: 4k (for updating) */
- reg = <0x00000000 0x00040000>;
+ reg = <0x00000000 0x00044000>;
};
rw-a-vblock {
label = "vblock-a";
@@ -39,14 +39,14 @@
rw-a-boot {
/* Alignment: no requirement (yet). */
label = "fw-main-a";
- reg = <0x00002000 0x0003dfc0>;
+ reg = <0x00002000 0x00041fc0>;
type = "blob boot,ramstage";
with_index;
};
rw-a-firmware-id {
/* Alignment: no requirement. */
label = "rw-fwid-a";
- reg = <0x0003ffc0 0x00000040>;
+ reg = <0x00043fc0 0x00000040>;
read-only;
type = "blobstring fwid";
};
@@ -58,7 +58,7 @@
* Anything in this range may be updated in recovery.
*/
label = "rw-shared";
- reg = <0x00040000 0x00002000>;
+ reg = <0x00044000 0x00002000>;
};
shared-data {
label = "shared-data";
@@ -66,7 +66,7 @@
* Alignment: 4k (for random read/write).
* RW firmware can put calibration data here.
*/
- reg = <0x00040000 0x00002000>;
+ reg = <0x00044000 0x00002000>;
type = "wiped";
wipe-value = [00];
};
@@ -75,7 +75,7 @@
rw-elog {
label = "rw-elog";
/* Alignment: 4K (for updating) */
- reg = <0x00042000 0x00002000>;
+ reg = <0x00046000 0x00002000>;
type = "wiped";
wipe-value = [ff];
};
@@ -84,7 +84,7 @@
rw-b {
label = "rw-section-b";
/* Alignment: 4k (for updating) */
- reg = <0x00044000 0x00040000>;
+ reg = <0x00048000 0x00044000>;
};
rw-b-vblock {
label = "vblock-b";
@@ -92,7 +92,7 @@
* Alignment: 4k (for updating) and must be in start of
* each RW_SECTION.
*/
- reg = <0x00044000 0x00002000>;
+ reg = <0x00048000 0x00002000>;
type = "keyblock boot,ramstage";
with_index;
keyblock = "firmware.keyblock";
@@ -104,14 +104,14 @@
rw-b-boot {
label = "fw-main-b";
/* Alignment: no requirement (yet). */
- reg = <0x00046000 0x0003dfc0>;
+ reg = <0x0004a000 0x00041fc0>;
type = "blob boot,ramstage";
with_index;
};
rw-b-firmware-id {
label = "rw-fwid-b";
/* Alignment: no requirement. */
- reg = <0x00083fc0 0x00000040>;
+ reg = <0x0008bfc0 0x00000040>;
read-only;
type = "blobstring fwid";
};
@@ -120,26 +120,26 @@
rw-vpd {
label = "rw-vpd";
/* Alignment: 4k (for updating) */
- reg = <0x00084000 0x00002000>;
+ reg = <0x0008c000 0x00002000>;
type = "wiped";
wipe-value = [ff];
};
rw-legacy {
label = "rw-legacy";
- reg = <0x00086000 0x0003a000>;
+ reg = <0x0008e000 0x0003a000>;
};
/* ---- Section: Read-only ---- */
wp-ro {
label = "wp-ro";
- reg = <0x000c0000 0x00140000>;
+ reg = <0x000c8000 0x00140000>;
read-only;
};
ro-section {
label = "ro-section";
- reg = <0x000c0000 0x00140000>;
+ reg = <0x000c8000 0x00140000>;
read-only;
};
@@ -151,7 +151,7 @@
* For example, aligning to 512KB is better than to
* 256KB. */
- reg = <0x000c0000 0x00001000>;
+ reg = <0x000c8000 0x00001000>;
read-only;
type = "fmap";
ver-major = <1>;
@@ -162,14 +162,14 @@
label = "gbb";
/* GBB offset must be aligned to 4K bytes */
- reg = <0x000c1000 0x0002ef00>;
+ reg = <0x000c9000 0x0002ef00>;
read-only;
type = "blob gbb";
};
ro-firmware-id {
label = "ro-frid";
- reg = <0x000eff00 0x00000100>;
+ reg = <0x000f7f00 0x00000100>;
read-only;
type = "blobstring fwid";
};
@@ -179,7 +179,7 @@
label = "ro-vpd";
/* VPD offset must be aligned to 4K bytes */
- reg = <0x000f0000 0x00010000>;
+ reg = <0x000f8000 0x00008000>;
read-only;
type = "wiped";
wipe-value = [ff];
