diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2012-05-04 14:00:55 -0700 |
|---|---|---|
| committer | Bill Richardson <wfrichar@chromium.org> | 2012-05-04 14:42:58 -0700 |
| commit | 3b361af2a76794b0d05be9a2cd6beaff4208cfd7 (patch) | |
| tree | c7976e42e4df927338ca0ed869df5e97187eb548 /common/fmap.c | |
| parent | d5deade06fc6e42bfdda14fd28dbc716922bf2da (diff) | |
| download | chrome-ec-3b361af2a76794b0d05be9a2cd6beaff4208cfd7.tar.gz | |
Update EC config and FMAP to reserve room for vboot signatures
This just reserves room. It doesn't actually perform any verification yet.
BUG=chrome-os-partner:7459
TEST=manual
make BOARD=link
dump_fmap build/link/ec.bin
Change-Id: I424db1d601a614be3dfe5abb200e24e8bc62e47e
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'common/fmap.c')
| -rw-r--r-- | common/fmap.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/common/fmap.c b/common/fmap.c index 5316917b6a..438a45d1c1 100644 --- a/common/fmap.c +++ b/common/fmap.c @@ -38,7 +38,6 @@ typedef struct _FmapAreaHeader { #define NUM_EC_FMAP_AREAS 14 - const struct _ec_fmap { FmapHeader header; FmapAreaHeader area[NUM_EC_FMAP_AREAS]; @@ -78,22 +77,22 @@ const struct _ec_fmap { /* Other RO stuff: FMAP, GBB, etc. */ { - /* FIXME(wfrichar): GBB != FMAP. Use the right terms */ - .area_name = "FMAP", - .area_offset = CONFIG_FW_RO_GBB_OFF, - .area_size = CONFIG_FW_RO_GBB_SIZE, + .area_name = "ROOT_KEY", + .area_offset = CONFIG_VBOOT_ROOTKEY_OFF, + .area_size = CONFIG_VBOOT_ROOTKEY_SIZE, .area_flags = FMAP_AREA_STATIC | FMAP_AREA_RO, }, { - .area_name = "GBB", - .area_offset = CONFIG_FW_RO_GBB_OFF, - .area_size = 0, + /* FIXME(wfrichar): GBB != FMAP. Use the right terms */ + .area_name = "FMAP", + .area_offset = (uint32_t)&ec_fmap, + .area_size = sizeof(ec_fmap), .area_flags = FMAP_AREA_STATIC | FMAP_AREA_RO, }, { /* A dummy region to identify it as EC firmware */ .area_name = "EC_IMAGE", - .area_offset = CONFIG_FW_RO_GBB_OFF, + .area_offset = CONFIG_FW_RO_OFF, .area_size = 0, /* Always zero */ .area_flags = FMAP_AREA_STATIC | FMAP_AREA_RO, }, @@ -108,7 +107,7 @@ const struct _ec_fmap { { .area_name = "FW_MAIN_A", .area_offset = CONFIG_FW_A_OFF, - .area_size = CONFIG_FW_IMAGE_SIZE, + .area_size = CONFIG_FW_A_SIZE, .area_flags = FMAP_AREA_STATIC, }, { @@ -119,8 +118,8 @@ const struct _ec_fmap { }, { .area_name = "VBLOCK_A", - .area_offset = CONFIG_FW_A_OFF, - .area_size = 0, + .area_offset = CONFIG_VBLOCK_A_OFF, + .area_size = CONFIG_VBLOCK_A_SIZE, .area_flags = FMAP_AREA_STATIC, }, @@ -134,7 +133,7 @@ const struct _ec_fmap { { .area_name = "FW_MAIN_B", .area_offset = CONFIG_FW_B_OFF, - .area_size = CONFIG_FW_IMAGE_SIZE, + .area_size = CONFIG_FW_B_SIZE, .area_flags = FMAP_AREA_STATIC, }, { @@ -145,8 +144,8 @@ const struct _ec_fmap { }, { .area_name = "VBLOCK_B", - .area_offset = CONFIG_FW_A_OFF, - .area_size = 0, + .area_offset = CONFIG_VBLOCK_B_OFF, + .area_size = CONFIG_VBLOCK_B_SIZE, .area_flags = FMAP_AREA_STATIC, }, } |