diff options
| author | Hung-Te Lin <hungte@chromium.org> | 2012-07-20 10:12:45 +0800 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-07-23 03:38:52 -0700 |
| commit | 7693bbd2e44f26b62084f79643f1b6766f415ae8 (patch) | |
| tree | a89288cb3993db2432b0cd8ae3604538cfb870d4 /common/fmap.c | |
| parent | ee71c0ae1b8f34b955e466e2c84d7fd95c55ace3 (diff) | |
| download | chrome-ec-7693bbd2e44f26b62084f79643f1b6766f415ae8.tar.gz | |
ec: Remove "_A" suffix in FMAP RW firmware areas.
Since we only have one RW firmware, let's remove _A to prevent confusion.
Also change "BOOT_STUB" to FR_MAIN to reflect the fact that it's not just
bootstub - it's a full firmware area just like FW_MAIN.
BUG=chrome-os-partner:11360
TEST=emerge-link chromeos-ec; dump_fmap -x /build/link/firmware/ec.bin
Change-Id: Ia84062ada5959164b2b4e0f9cc5fcc032ca6f71e
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/27971
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Tested-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'common/fmap.c')
| -rw-r--r-- | common/fmap.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/common/fmap.c b/common/fmap.c index fb50e23dd7..e01591b6fc 100644 --- a/common/fmap.c +++ b/common/fmap.c @@ -40,7 +40,7 @@ typedef struct _FmapAreaHeader { } __packed FmapAreaHeader; #ifdef CONFIG_VBOOT_SIG -#define NUM_EC_FMAP_AREAS (7 + 4) +#define NUM_EC_FMAP_AREAS (7 + 3) #else #define NUM_EC_FMAP_AREAS 7 #endif @@ -72,8 +72,8 @@ const struct _ec_fmap { .area_flags = FMAP_AREA_STATIC | FMAP_AREA_RO, }, { - /* (Optional) RO firmware boot execution code. */ - .area_name = "BOOT_STUB", + /* (Optional) RO firmware code. */ + .area_name = "FR_MAIN", .area_offset = CONFIG_FW_RO_OFF, .area_size = CONFIG_FW_RO_SIZE, .area_flags = FMAP_AREA_STATIC | FMAP_AREA_RO, @@ -134,21 +134,14 @@ const struct _ec_fmap { }, #ifdef CONFIG_VBOOT_SIG - /* Firmware A */ { - .area_name = "RW_SECTION_A", - .area_offset = CONFIG_SECTION_RW_OFF, - .area_size = CONFIG_SECTION_RW_SIZE, - .area_flags = FMAP_AREA_STATIC, - }, - { - .area_name = "FW_MAIN_A", + .area_name = "FW_MAIN", .area_offset = CONFIG_FW_RW_OFF, .area_size = CONFIG_FW_RW_SIZE, .area_flags = FMAP_AREA_STATIC, }, { - .area_name = "VBLOCK_A", + .area_name = "VBLOCK", .area_offset = CONFIG_VBLOCK_RW_OFF, .area_size = CONFIG_VBLOCK_SIZE, .area_flags = FMAP_AREA_STATIC, |