diff options
| -rw-r--r-- | common/version.c | 4 | ||||
| -rw-r--r-- | include/version.h | 6 | ||||
| -rwxr-xr-x | util/getversion.sh | 21 |
3 files changed, 19 insertions, 12 deletions
diff --git a/common/version.c b/common/version.c index 36567095ff..a2f554e58d 100644 --- a/common/version.c +++ b/common/version.c @@ -12,9 +12,9 @@ const struct version_struct version_data __attribute__((section(".rodata.ver"))) = { CROS_EC_VERSION_COOKIE1, - CROS_EC_VERSION, + CROS_EC_VERSION32, CROS_EC_VERSION_COOKIE2 }; const char build_info[] __attribute__((section(".rodata.buildinfo"))) = - CROS_EC_BUILD_INFO; + CROS_EC_VERSION " " DATE " " BUILDER; diff --git a/include/version.h b/include/version.h index aca6b87a73..18968ce072 100644 --- a/include/version.h +++ b/include/version.h @@ -8,15 +8,9 @@ #ifndef __CROS_EC_VERSION_H #define __CROS_EC_VERSION_H -#define STRINGIFY0(name) #name -#define STRINGIFY(name) STRINGIFY0(name) - #define CROS_EC_VERSION_COOKIE1 0xce112233 #define CROS_EC_VERSION_COOKIE2 0xce445566 -#define CROS_EC_VERSION STRINGIFY(BOARD) "_" VERSION -#define CROS_EC_BUILD_INFO CROS_EC_VERSION " " DATE " " BUILDER - struct version_struct { uint32_t cookie1; char version[32]; diff --git a/util/getversion.sh b/util/getversion.sh index 06061ada93..4d1931d4a2 100755 --- a/util/getversion.sh +++ b/util/getversion.sh @@ -24,14 +24,27 @@ if ghash=`git rev-parse --short --verify HEAD 2>/dev/null`; then git status > /dev/null 2>&1 dirty=`sh -c "[ '$(git diff-index --name-only HEAD)' ] && echo '-dirty'"` - ver="${ver_major}.${ver_branch}.${numcommits}-${ghash}${dirty}" + vbase="${ver_major}.${ver_branch}.${numcommits}-${ghash}${dirty}" else - ver="no_version" + vbase="no_version" fi + +ver="${BOARD}_${vbase}" + +echo "/* This file is generated by util/getversion.sh */" + +echo "/* Version string for use by common/version.c */" echo "#ifdef SHIFT_CODE_FOR_TEST" -echo "#define VERSION \"${ver}_shift\"" +echo "#define CROS_EC_VERSION \"${ver}_shift\"" echo "#else" -echo "#define VERSION \"${ver}\"" +echo "#define CROS_EC_VERSION \"${ver}\"" echo "#endif" + +echo "/* Version string, truncated to 31 chars (+ terminating null = 32) */" +echo "#define CROS_EC_VERSION32 \"${ver:0:31}\"" + +echo "/* Sub-fields for use in Makefile.rules and to form build info string" +echo " * in common/version.c. */" +echo "#define VERSION \"${ver}\"" echo "#define DATE \"`date '+%F %T'`\"" echo "#define BUILDER \"${USER}@`hostname`\"" |