diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2018-05-22 11:00:32 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-05-22 21:57:12 -0700 |
| commit | 2531d5787184d78187ccb8dc857aea0e766892d8 (patch) | |
| tree | 6629341db0e5ca3af902adc420ac054fe79b9f50 | |
| parent | 9df26ce0f2a97bbc58b1807483fd22005e253b0f (diff) | |
| download | chrome-ec-2531d5787184d78187ccb8dc857aea0e766892d8.tar.gz | |
util: do not generate redundant CROS_EC_VERSION
The values of CROS_EC_VERSION and VERSION variables generated by
getversion.sh are exactly the same. VERSION is used in more places
than CROS_EC_VERSION, let's keep VERSION and use it everywhere.
BRANCH=none
BUG=chromium:632937
TEST=make buildall
Change-Id: Ibec9ecdd4b67789a468dddfbc1c82565f90d48a8
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1069330
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | common/version.c | 2 | ||||
| -rwxr-xr-x | util/getversion.sh | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/common/version.c b/common/version.c index 06cbfbab01..550f383a66 100644 --- a/common/version.c +++ b/common/version.c @@ -26,7 +26,7 @@ const struct image_data __keep current_image_data }; const char build_info[] __keep __attribute__((section(".rodata.buildinfo"))) = - CROS_EC_VERSION " " DATE " " BUILDER; + VERSION " " DATE " " BUILDER; uint32_t ver_get_numcommits(void) { diff --git a/util/getversion.sh b/util/getversion.sh index 1d00080e58..07ebec9d7c 100755 --- a/util/getversion.sh +++ b/util/getversion.sh @@ -110,9 +110,6 @@ IFS=' ' first_word=(${ver}) echo "/* This file is generated by util/getversion.sh */" -echo "/* Version string for use by common/version.c */" -echo "#define CROS_EC_VERSION \"${ver}\"" - echo "/* Version string, truncated to 31 chars (+ terminating null = 32) */" echo "#define CROS_EC_VERSION32 \"${first_word:0:31}\"" |