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/version.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/version.c')
| -rw-r--r-- | common/version.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/common/version.c b/common/version.c index ff8207bf2c..3757c9d5b4 100644 --- a/common/version.c +++ b/common/version.c @@ -10,14 +10,11 @@ #include "ec_version.h" #include "version.h" -const struct image_data __keep current_image_data +const struct version_struct __keep version_data __attribute__((section(".rodata.ver"))) = { - .cookie1 = CROS_EC_IMAGE_DATA_COOKIE1, - .version = CROS_EC_VERSION32, -#ifndef TEST_BUILD - .size = (const uintptr_t)&__image_size, -#endif - .cookie2 = CROS_EC_IMAGE_DATA_COOKIE2, + CROS_EC_VERSION_COOKIE1, + CROS_EC_VERSION32, + CROS_EC_VERSION_COOKIE2 }; const char build_info[] __keep __attribute__((section(".rodata.buildinfo"))) = @@ -35,7 +32,7 @@ uint32_t ver_get_numcommits(void) * we want to return the numcommits as an int. */ for (i = 0; i < 32; i++) { - if (current_image_data.version[i] == '.') { + if (version_data.version[i] == '.') { numperiods++; if (numperiods == 2) break; @@ -44,11 +41,12 @@ uint32_t ver_get_numcommits(void) i++; for (; i < 32; i++) { - if (current_image_data.version[i] == '-') + if (version_data.version[i] == '-') break; ret *= 10; - ret += current_image_data.version[i] - '0'; + ret += version_data.version[i] - '0'; } return (i == 32 ? 0 : ret); } + |