diff options
| author | Pali Rohár <pali@kernel.org> | 2021-08-02 15:18:37 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-17 12:10:44 -0400 |
| commit | bc21ccbaaa7dda32ec6250cac5f9c9e47e5b629a (patch) | |
| tree | e297486b0b529f23ab8cac55461edb33be455b73 | |
| parent | fd004950804a60ebcba8dcc0cc850d793c3aa1ea (diff) | |
| download | u-boot-bc21ccbaaa7dda32ec6250cac5f9c9e47e5b629a.tar.gz u-boot-bc21ccbaaa7dda32ec6250cac5f9c9e47e5b629a.tar.bz2 u-boot-bc21ccbaaa7dda32ec6250cac5f9c9e47e5b629a.zip | |
version: Remove global macro U_BOOT_VERSION_STRING from version.h
Version string is available in global variable char version_string[].
Macro U_BOOT_VERSION_STRING is not used by any other file, so remove it
completely from version.h. Other files were already converted to use
variable version_string[].
Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | cmd/version.c | 3 | ||||
| -rw-r--r-- | doc/develop/version.rst | 21 | ||||
| -rw-r--r-- | include/version.h | 3 |
3 files changed, 15 insertions, 12 deletions
diff --git a/cmd/version.c b/cmd/version.c index 2f9b898655..130e31cd84 100644 --- a/cmd/version.c +++ b/cmd/version.c @@ -13,6 +13,9 @@ #include <asm/cb_sysinfo.h> #endif +#define U_BOOT_VERSION_STRING U_BOOT_VERSION " (" U_BOOT_DATE " - " \ + U_BOOT_TIME " " U_BOOT_TZ ")" CONFIG_IDENT_STRING + const char version_string[] = U_BOOT_VERSION_STRING; static int do_version(struct cmd_tbl *cmdtp, int flag, int argc, diff --git a/doc/develop/version.rst b/doc/develop/version.rst index 066901bcd2..8f3231b761 100644 --- a/doc/develop/version.rst +++ b/doc/develop/version.rst @@ -60,15 +60,6 @@ The following are available: This is used as part of the banner string when U-Boot starts. - U_BOOT_VERSION_STRING (string #define) - U_BOOT_VERSION followed by build-time information - and CONFIG_IDENT_STRING. - - Examples:: - - U-Boot 2020.10 (Jan 06 2021 - 08:50:36 -0700) - U-Boot 2021.01-rc5-00248-g60dd854f3ba-dirty (Jan 06 2021 - 08:50:36 -0700) for spring - U_BOOT_VERSION_NUM (integer #define) Release year, e.g. 2021 for release 2021.01. Note this is an integer, not a string. @@ -77,6 +68,18 @@ The following are available: Patch number, e.g. 1 for release 2020.01. Note this is an integer, not a string. +Human readable U-Boot version string is available in header file +include/version_string.h in following variable: + + version_string (const char[]) + U_BOOT_VERSION followed by build-time information + and CONFIG_IDENT_STRING. + + Examples:: + + U-Boot 2020.10 (Jan 06 2021 - 08:50:36 -0700) + U-Boot 2021.01-rc5-00248-g60dd854f3ba-dirty (Jan 06 2021 - 08:50:36 -0700) for spring + Build date/time is also included. See the generated file include/generated/timestamp_autogenerated.h for the available fields. For example:: diff --git a/include/version.h b/include/version.h index 0a3b29adb8..8ee07134fd 100644 --- a/include/version.h +++ b/include/version.h @@ -13,7 +13,4 @@ #include "generated/version_autogenerated.h" #endif -#define U_BOOT_VERSION_STRING U_BOOT_VERSION " (" U_BOOT_DATE " - " \ - U_BOOT_TIME " " U_BOOT_TZ ")" CONFIG_IDENT_STRING - #endif /* __VERSION_H__ */ |