diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-07-17 09:58:17 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-07-17 13:11:44 -0700 |
| commit | fc7b64e186723f32a00663f51161a467af58c2f3 (patch) | |
| tree | 7b7b3e0b65f4cca2ea91b0743b196dbd95926c9f /common/fmap.c | |
| parent | c44c17890c2fbda1edc74361b0174fed405f9eee (diff) | |
| download | chrome-ec-fc7b64e186723f32a00663f51161a467af58c2f3.tar.gz | |
Remove firmware B
BUG=chrome-os-partner:11449
TEST=build link, snow, bds; ectool reboot_ec cold to make sure enums line up
Change-Id: Ie09db2080a00f1a7e2c05579b9b41ea5137c1af0
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/27658
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'common/fmap.c')
| -rw-r--r-- | common/fmap.c | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/common/fmap.c b/common/fmap.c index 685e872aa3..82a380f031 100644 --- a/common/fmap.c +++ b/common/fmap.c @@ -40,7 +40,7 @@ typedef struct _FmapAreaHeader { } __packed FmapAreaHeader; -#define NUM_EC_FMAP_AREAS 17 +#define NUM_EC_FMAP_AREAS 13 const struct _ec_fmap { FmapHeader header; FmapAreaHeader area[NUM_EC_FMAP_AREAS]; @@ -108,11 +108,10 @@ const struct _ec_fmap { .area_flags = FMAP_AREA_STATIC | FMAP_AREA_RO, }, { - /* The range for autoupdate to update A/B at once. */ + /* The range for autoupdate to update RW */ .area_name = "EC_RW", .area_offset = CONFIG_SECTION_RW_OFF, - .area_size = CONFIG_SECTION_RW_SIZE - + CONFIG_SECTION_RW_B_SIZE, + .area_size = CONFIG_SECTION_RW_SIZE, .area_flags = FMAP_AREA_STATIC | FMAP_AREA_RO, }, { @@ -151,35 +150,5 @@ const struct _ec_fmap { .area_size = CONFIG_VBLOCK_SIZE, .area_flags = FMAP_AREA_STATIC, }, - -#ifdef CONFIG_RW_B - /* Firmware B */ - { - .area_name = "RW_SECTION_B", - .area_offset = CONFIG_SECTION_RW_B_OFF, - .area_size = CONFIG_SECTION_RW_B_SIZE, - .area_flags = FMAP_AREA_STATIC, - }, - { - .area_name = "FW_MAIN_B", - .area_offset = CONFIG_FW_RW_B_OFF, - .area_size = CONFIG_FW_RW_B_SIZE, - .area_flags = FMAP_AREA_STATIC, - }, - { - .area_name = "RW_FWID_B", /* FIXME: Where is it? */ - .area_offset = CONFIG_FW_RW_B_OFF + - (uint32_t)__version_struct_offset + - offsetof(struct version_struct, version), - .area_size = sizeof(version_data.version), - .area_flags = FMAP_AREA_STATIC, - }, - { - .area_name = "VBLOCK_B", - .area_offset = CONFIG_VBLOCK_RW_B_OFF, - .area_size = CONFIG_VBLOCK_SIZE, - .area_flags = FMAP_AREA_STATIC, - }, -#endif /* CONFIG_RW_B */ } }; |