scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-30 18:41:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

ec: Remove "_A" suffix in FMAP RW firmware areas.

Browse Source 
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>
This commit is contained in:
Hung-Te Lin
2012-07-20 10:12:45 +08:00
committed by Gerrit
parent ee71c0ae1b
commit 7693bbd2e4
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/fmap.c
View File

@@ -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,