diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2017-01-31 22:13:13 -0800 |
|---|---|---|
| committer | Vadim Bendebury <vbendeb@chromium.org> | 2017-02-01 06:36:18 +0000 |
| commit | 11704ae6e9c35889ed1ec97bdaa9d42652397867 (patch) | |
| tree | 12f7d873426f43c5c3d8ed84e7b7b7f1d20b199d /common/fmap.c | |
| parent | 9fc399a0aaa4a12591907b498d4826a35fe4a806 (diff) | |
| download | chrome-ec-11704ae6e9c35889ed1ec97bdaa9d42652397867.tar.gz | |
Revert "version: Store image size data in version struct"
This is a dependency of the uderlyaing patch which breaks header
composition of g chip based boards.
This reverts commit 7cbb815732d7434f5985d3b50a869aa71ba5c507.
Change-Id: I4d94647cf5cb09fd338e5a581c956df6b5d83081
Reviewed-on: https://chromium-review.googlesource.com/435551
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
Tested-by: Vadim Bendebury <vbendeb@chromium.org>
Diffstat (limited to 'common/fmap.c')
| -rw-r--r-- | common/fmap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/common/fmap.c b/common/fmap.c index 9ddd670fd4..6f84c37b63 100644 --- a/common/fmap.c +++ b/common/fmap.c @@ -109,9 +109,9 @@ const struct _ec_fmap { .area_name = "RO_FRID", .area_offset = CONFIG_EC_PROTECTED_STORAGE_OFF - FMAP_REGION_START + CONFIG_RO_STORAGE_OFF + - RELATIVE_RO((uint32_t)__image_data_offset) + - offsetof(struct image_data, version), - .area_size = sizeof(current_image_data.version), + RELATIVE_RO((uint32_t)__version_struct_offset) + + offsetof(struct version_struct, version), + .area_size = sizeof(version_data.version), .area_flags = FMAP_AREA_STATIC | FMAP_AREA_RO, }, @@ -151,15 +151,15 @@ const struct _ec_fmap { * RW firmware version ID. Must be NULL terminated * ASCII, and padded with \0. * TODO: Get the relative offset of - * __image_data_offset within our RW image to + * __version_struct_offset within our RW image to * accommodate image asymmetry. */ .area_name = "RW_FWID", .area_offset = CONFIG_EC_WRITABLE_STORAGE_OFF - FMAP_REGION_START + CONFIG_RW_STORAGE_OFF + - RELATIVE_RO((uint32_t)__image_data_offset) + - offsetof(struct image_data, version), - .area_size = sizeof(current_image_data.version), + RELATIVE_RO((uint32_t)__version_struct_offset) + + offsetof(struct version_struct, version), + .area_size = sizeof(version_data.version), .area_flags = FMAP_AREA_STATIC, }, } |