reef: Update fmap.dts file
authorFurquan Shaikh <furquan@google.com>
Wed, 22 Jun 2016 18:35:35 +0000 (11:35 -0700)
committerchrome-bot <chrome-bot@chromium.org>
Fri, 24 Jun 2016 03:19:27 +0000 (20:19 -0700)
1. Mark 256KiB at end of BIOS region as unusable BIOS region is
memory-mapped just below 4GiB, however last 256KiB is unusable. Mark it
accordingly in fmd file.
2. Use up holes in RW region for RW_A and RW_B.
3. Fill up holes in RO with UNUSED regions.

CQ-DEPEND=CL:355741
BUG=chrome-os-partner:54672
BRANCH=None
TEST=Compiles successfully

Change-Id: I13ea617c02a8ab3d282fad1014a8d2594fc54f30
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/354785
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
board/reef/fmap.dts

index fb596f4..8725cac 100644 (file)
                        read-only;
                        type = "blobstring fwid";
                };
+               ro-frid-pad {
+                       label ="ro-frid-pad";
+                       reg = <0x00204840 0x000007c0>;
+                       read-only;
+                       type = "wiped";
+                       wipe-value = [ff];
+               };
                ro-boot {
                        label = "coreboot";
                        reg = <0x00205000 0x0017b000>;
                        read-only;
                        type = "blob gbb";
                };
+               ro-unused-1 {
+                       label ="ro-unused-1";
+                       reg = <0x003c0000 0x00400000>;
+                       read-only;
+                       type = "wiped";
+                       wipe-value = [ff];
+               };
                ro-sig2 {
                        label = "sign_cse";
                        reg = <0x007c0000 0x00010000>;
                        required;
                        type = "blob sig2";
                };
+               ro-unused-2 {
+                       label ="ro-unused-2";
+                       reg = <0x007d0000 0x00030000>;
+                       read-only;
+                       type = "wiped";
+                       wipe-value = [ff];
+               };
                /* ---- Section: Rewritable MRC cache 64KB ---- */
                rw-mrc-cache {
                        label = "rw-mrc-cache";
                rw-a {
                        label = "rw-section-a";
                        /* Alignment: 4k (for updating) */
-                       reg = <0x0081a000 0x00173000>;
+                       reg = <0x0081a000 0x0028f800>;
                };
                rw-a-vblock {
                        label = "vblock-a";
                rw-a-boot {
                        /* Alignment: no requirement (yet). */
                        label = "fw-main-a";
-                       reg = <0x0082a000 0x00162fc0>;
+                       reg = <0x0082a000 0x0027f7c0>;
                        type = "blob cbfs/rw/a-boot";
                };
                rw-a-firmware-id {
                        /* Alignment: no requirement. */
                        label = "rw-fwid-a";
-                       reg = <0x0098cfc0 0x00000040>;
+                       reg = <0x00aa97c0 0x00000040>;
                        read-only;
                        type = "blobstring fwid";
                };
                rw-b {
                        label = "rw-section-b";
                        /* Alignment: 4k (for updating) */
-                       reg = <0x0098d000 0x00173000>;
+                       reg = <0x00aa9800 0x0028f800>;
                };
                rw-b-vblock {
                        label = "vblock-b";
                         * Alignment: 4k (for updating) and must be in start of
                         * each RW_SECTION.
                         */
-                       reg = <0x0098d000 0x00010000>;
+                       reg = <0x00aa9800 0x00010000>;
                        type = "keyblock cbfs/rw/b-boot";
                        keyblock = "firmware.keyblock";
                        signprivate = "firmware_data_key.vbprivk";
                rw-b-boot {
                        label = "fw-main-b";
                        /* Alignment: no requirement (yet). */
-                       reg = <0x0099d000 0x00162fc0>;
+                       reg = <0x00ab9800 0x0027f7c0>;
                        type = "blob cbfs/rw/b-boot";
                };
                rw-b-firmware-id {
                        label = "rw-fwid-b";
                        /* Alignment: no requirement. */
-                       reg = <0x00afffc0 0x00000040>;
+                       reg = <0x00d38fc0 0x00000040>;
                        read-only;
                        type = "blobstring fwid";
                };
                /* ---- Section: Storage to simulate NVRAM ---- */
                rw-nvram {
                        label = "rw-nvram";
-                       reg = <0x00b00000 0x00006000>;
+                       reg = <0x00d39000 0x00006000>;
                        type = "wiped";
                        wipe-value = [ff];
                };
 
                rw-legacy {
                        label = "rw-legacy";
-                       reg = <0x00b06000 0x00200000>;
+                       reg = <0x00d3f000 0x00200000>;
                        type = "blob legacy";
                        read-only;
                };
 
+               /* ---- Last 256KiB of BIOS is unusable. ---- */
+               bios-unusable {
+                       label ="bios-unusable";
+                       reg = <0x00f3f000 0x00040000>;
+                       read-only;
+                       type = "wiped";
+                       wipe-value = [ff];
+               };
+
                device-extension {
                        /* CSE RW data */
                        label = "device-extension";
-                       reg = <0x00f7f000 0x00081000>;
+                       reg = <0x00f7f000 0x00080000>;
+                       type = "wiped";
+                       wipe-value = [ff];
+               };
+
+               unused-hole {
+                       label ="unused-hole";
+                       reg = <0x00fff000 0x00001000>;
+                       read-only;
                        type = "wiped";
                        wipe-value = [ff];
                };