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 /chip/g/system.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 'chip/g/system.c')
| -rw-r--r-- | chip/g/system.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chip/g/system.c b/chip/g/system.c index 041ee8e9b5..ad553168c5 100644 --- a/chip/g/system.c +++ b/chip/g/system.c @@ -259,7 +259,7 @@ static char vers_str[MAX_RO_VER_LEN]; const char *system_get_version(enum system_image_copy_t copy) { - const struct image_data *data; + const struct version_struct *v; const struct SignedHeader *h; enum system_image_copy_t this_copy; uintptr_t vaddr, delta; @@ -290,7 +290,7 @@ const char *system_get_version(enum system_image_copy_t copy) if (copy == this_copy) { snprintf(vers_str, sizeof(vers_str), "%d.%d.%d/%s", h->epoch_, h->major_, h->minor_, - current_image_data.version); + version_data.version); return vers_str; } @@ -299,7 +299,7 @@ const char *system_get_version(enum system_image_copy_t copy) * puts the version string right after the reset vectors, so * it's at the same relative offset. Measure that offset here. */ - delta = (uintptr_t)¤t_image_data - vaddr; + delta = (uintptr_t)&version_data - vaddr; /* Now look at that offset in the requested image */ vaddr = get_program_memory_addr(copy); @@ -307,18 +307,17 @@ const char *system_get_version(enum system_image_copy_t copy) break; h = (const struct SignedHeader *)vaddr; vaddr += delta; - data = (const struct image_data *)vaddr; + v = (const struct version_struct *)vaddr; /* * Make sure the version struct cookies match before returning * the version string. */ - if (data->cookie1 == current_image_data.cookie1 && - data->cookie2 == current_image_data.cookie2 && + if (v->cookie1 == version_data.cookie1 && + v->cookie2 == version_data.cookie2 && h->magic) { /* Corrupted header's magic is set to zero. */ snprintf(vers_str, sizeof(vers_str), "%d.%d.%d/%s", - h->epoch_, h->major_, h->minor_, - data->version); + h->epoch_, h->major_, h->minor_, v->version); return vers_str; } default: |