summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2013-09-19 12:26:56 (GMT)
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2013-09-20 16:36:56 (GMT)
commit5ebba02614642d7ac51dae1d33f1872c63731672 (patch)
tree34bce1df8f8c27f160c270e6c21e5e072f352a87
parent5f4b2e209abb21ac3ecf0a9737e6b40a3db286d1 (diff)
downloaddepthcharge-stabilize-4731.62.B.tar.gz
depthcharge-stabilize-4731.62.B.tar.xz
A comment in the fmap said that the GBB should be aligned on a 4K boundary, but the actual layout of the image had it at an offset. This caused some GBB related utilities like gbb_set_flags.sh (used during FAFT tests) to misbehave and wipe out other parts of the image, specifically the read only firmware id. This change fixes things by switching the RO firmware id and the GBB while keeping everything the same size and all the other sections in place. The GBB's size isn't a multiple of 4K which is assumed to be ok. BUG=None TEST=Built and booted on pit with this change. Ran /usr/share/vboot/bin/set_gbb_flags.sh and verified that the RO firmware ID was still intact by rebooting and running crossystem. Before this change the RO firmware ID would be replaced with all zeroes. BRANCH=None Change-Id: Icb6db326b54fce167ef83ae12e127669c9af1305 Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: https://chromium-review.googlesource.com/170003 Reviewed-by: Stefan Reinauer <reinauer@google.com> Reviewed-by: Randall Spangler <rspangler@chromium.org> Commit-Queue: Gabe Black <gabeblack@chromium.org> Tested-by: Gabe Black <gabeblack@chromium.org>
-rw-r--r--board/daisy/fmap.dts16
-rw-r--r--board/peach_kirby/fmap.dts16
-rw-r--r--board/peach_pit/fmap.dts16
3 files changed, 24 insertions, 24 deletions
diff --git a/board/daisy/fmap.dts b/board/daisy/fmap.dts
index 87ba2e9..e4ed961 100644
--- a/board/daisy/fmap.dts
+++ b/board/daisy/fmap.dts
@@ -59,22 +59,22 @@
ver-minor = <0>;
};
- ro-firmware-id {
- label = "ro-frid";
- reg = <0x00101000 0x00000100>;
- read-only;
- type = "blobstring fwid";
- };
-
ro-gbb {
label = "gbb";
/* GBB offset must be aligned to 4K bytes */
- reg = <0x00101100 0x000eef00>;
+ reg = <0x00101000 0x000eef00>;
read-only;
type = "blob gbb";
};
+ ro-firmware-id {
+ label = "ro-frid";
+ reg = <0x001eff00 0x00000100>;
+ read-only;
+ type = "blobstring fwid";
+ };
+
/* ---- Section: Vital-product data (VPD) ---- */
ro-vpd {
label = "ro-vpd";
diff --git a/board/peach_kirby/fmap.dts b/board/peach_kirby/fmap.dts
index 59c5e28..3db1c2d 100644
--- a/board/peach_kirby/fmap.dts
+++ b/board/peach_kirby/fmap.dts
@@ -49,22 +49,22 @@
ver-minor = <0>;
};
- ro-firmware-id {
- label = "ro-frid";
- reg = <0x00101000 0x00000100>;
- read-only;
- type = "blobstring fwid";
- };
-
ro-gbb {
label = "gbb";
/* GBB offset must be aligned to 4K bytes */
- reg = <0x00101100 0x000eef00>;
+ reg = <0x00101000 0x000eef00>;
read-only;
type = "blob gbb";
};
+ ro-firmware-id {
+ label = "ro-frid";
+ reg = <0x001eff00 0x00000100>;
+ read-only;
+ type = "blobstring fwid";
+ };
+
/* ---- Section: Vital-product data (VPD) ---- */
ro-vpd {
label = "ro-vpd";
diff --git a/board/peach_pit/fmap.dts b/board/peach_pit/fmap.dts
index 85787ec..b04ad8f 100644
--- a/board/peach_pit/fmap.dts
+++ b/board/peach_pit/fmap.dts
@@ -49,22 +49,22 @@
ver-minor = <0>;
};
- ro-firmware-id {
- label = "ro-frid";
- reg = <0x00101000 0x00000100>;
- read-only;
- type = "blobstring fwid";
- };
-
ro-gbb {
label = "gbb";
/* GBB offset must be aligned to 4K bytes */
- reg = <0x00101100 0x000eef00>;
+ reg = <0x00101000 0x000eef00>;
read-only;
type = "blob gbb";
};
+ ro-firmware-id {
+ label = "ro-frid";
+ reg = <0x001eff00 0x00000100>;
+ read-only;
+ type = "blobstring fwid";
+ };
+
/* ---- Section: Vital-product data (VPD) ---- */
ro-vpd {
label = "ro-vpd";