diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-07-17 09:35:48 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-07-17 10:50:30 -0700 |
| commit | c44c17890c2fbda1edc74361b0174fed405f9eee (patch) | |
| tree | 5aef62d95ede8a41b26e763ef58d4dc045ed8842 /common/fmap.c | |
| parent | dae19428a6124300dc91ad4167ed3093d3dc3e07 (diff) | |
| download | chrome-ec-c44c17890c2fbda1edc74361b0174fed405f9eee.tar.gz | |
Rename A and B images to RW and RW_B, part 1
All of our current EC configs have RO and a single RW image. Calling
that image 'A' is confusing, particularly when combined with EC
software sync (where the RW image is updated from either the A or B AP
RW firmware). So, rename it.
This changes all the build artifacts and constants. Internal EC
commands and host commands still refer to A/B; that will be fixed in
part 2.
BUG=none
TEST=build link, snow, bds
Change-Id: Icfed4914745f0799bb71befb6a6563cfd8bc90ab
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/27649
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'common/fmap.c')
| -rw-r--r-- | common/fmap.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/common/fmap.c b/common/fmap.c index 5a06e29b4f..685e872aa3 100644 --- a/common/fmap.c +++ b/common/fmap.c @@ -110,9 +110,9 @@ const struct _ec_fmap { { /* The range for autoupdate to update A/B at once. */ .area_name = "EC_RW", - .area_offset = CONFIG_SECTION_A_OFF, - .area_size = CONFIG_SECTION_A_SIZE - + CONFIG_SECTION_B_SIZE, + .area_offset = CONFIG_SECTION_RW_OFF, + .area_size = CONFIG_SECTION_RW_SIZE + + CONFIG_SECTION_RW_B_SIZE, .area_flags = FMAP_AREA_STATIC | FMAP_AREA_RO, }, { @@ -127,19 +127,19 @@ const struct _ec_fmap { /* Firmware A */ { .area_name = "RW_SECTION_A", - .area_offset = CONFIG_SECTION_A_OFF, - .area_size = CONFIG_SECTION_A_SIZE, + .area_offset = CONFIG_SECTION_RW_OFF, + .area_size = CONFIG_SECTION_RW_SIZE, .area_flags = FMAP_AREA_STATIC, }, { .area_name = "FW_MAIN_A", - .area_offset = CONFIG_FW_A_OFF, - .area_size = CONFIG_FW_A_SIZE, + .area_offset = CONFIG_FW_RW_OFF, + .area_size = CONFIG_FW_RW_SIZE, .area_flags = FMAP_AREA_STATIC, }, { .area_name = "RW_FWID_A", /* FIXME: Where is it? */ - .area_offset = CONFIG_FW_A_OFF + + .area_offset = CONFIG_FW_RW_OFF + (uint32_t)__version_struct_offset + offsetof(struct version_struct, version), .area_size = sizeof(version_data.version), @@ -147,7 +147,7 @@ const struct _ec_fmap { }, { .area_name = "VBLOCK_A", - .area_offset = CONFIG_VBLOCK_A_OFF, + .area_offset = CONFIG_VBLOCK_RW_OFF, .area_size = CONFIG_VBLOCK_SIZE, .area_flags = FMAP_AREA_STATIC, }, @@ -156,19 +156,19 @@ const struct _ec_fmap { /* Firmware B */ { .area_name = "RW_SECTION_B", - .area_offset = CONFIG_SECTION_B_OFF, - .area_size = CONFIG_SECTION_B_SIZE, + .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_B_OFF, - .area_size = CONFIG_FW_B_SIZE, + .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_B_OFF + + .area_offset = CONFIG_FW_RW_B_OFF + (uint32_t)__version_struct_offset + offsetof(struct version_struct, version), .area_size = sizeof(version_data.version), @@ -176,7 +176,7 @@ const struct _ec_fmap { }, { .area_name = "VBLOCK_B", - .area_offset = CONFIG_VBLOCK_B_OFF, + .area_offset = CONFIG_VBLOCK_RW_B_OFF, .area_size = CONFIG_VBLOCK_SIZE, .area_flags = FMAP_AREA_STATIC, }, |