diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-08-07 15:43:57 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-08-07 19:06:33 -0700 |
| commit | 45cd8463a3e1611e4721ccb9f1beef8f4ab897af (patch) | |
| tree | e5e17df16d7b145dd5321e29a37fe9c45552fd07 /common/fmap.c | |
| parent | 29cbe516631f15d548be1da101b6f04f692982d4 (diff) | |
| download | chrome-ec-45cd8463a3e1611e4721ccb9f1beef8f4ab897af.tar.gz | |
Remove signature-based vboot support
Superseded by EC software sync (hash-based).
Sig-based vboot was correctly implemented, but ended up being too slow
to be useful given the limited processing power of the EC chips, and
we also couldn't come up with a manageable way to handle A/B
autoupdate of signed EC firmware.
This change and an associated vboot_reference change shrinks the EC
binary by ~2KB.
BUG=chrome-os-partner:11232
TEST=build link,snow; boot link and check that 'hash' command still works.
Change-Id: I3f03ae2d0a4030977826980d6ec5613181e154c2
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/29496
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'common/fmap.c')
| -rw-r--r-- | common/fmap.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/common/fmap.c b/common/fmap.c index 3adb1c1c6f..8035653128 100644 --- a/common/fmap.c +++ b/common/fmap.c @@ -45,11 +45,7 @@ typedef struct _FmapAreaHeader { uint16_t area_flags; } __packed FmapAreaHeader; -#ifdef CONFIG_VBOOT_SIG -#define NUM_EC_FMAP_AREAS (7 + 3) -#else #define NUM_EC_FMAP_AREAS 7 -#endif const struct _ec_fmap { FmapHeader header; @@ -112,16 +108,8 @@ const struct _ec_fmap { .area_size = CONFIG_SECTION_RO_SIZE, .area_flags = FMAP_AREA_STATIC | FMAP_AREA_RO, }, -#ifdef CONFIG_VBOOT_SIG - { - .area_name = "ROOT_KEY", - .area_offset = CONFIG_VBOOT_ROOTKEY_OFF, - .area_size = CONFIG_VBOOT_ROOTKEY_SIZE, - .area_flags = FMAP_AREA_STATIC | FMAP_AREA_RO, - }, -#endif - /* RW Firmware */ + /* RW Firmware */ { /* The range of RW firmware to be auto-updated. */ .area_name = "EC_RW", @@ -139,20 +127,5 @@ const struct _ec_fmap { .area_size = sizeof(version_data.version), .area_flags = FMAP_AREA_STATIC, }, - -#ifdef CONFIG_VBOOT_SIG - { - .area_name = "FW_MAIN", - .area_offset = CONFIG_FW_RW_OFF, - .area_size = CONFIG_FW_RW_SIZE, - .area_flags = FMAP_AREA_STATIC, - }, - { - .area_name = "VBLOCK", - .area_offset = CONFIG_VBLOCK_RW_OFF, - .area_size = CONFIG_VBLOCK_SIZE, - .area_flags = FMAP_AREA_STATIC, - }, -#endif } }; |