leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

version: Remove global macro U_BOOT_VERSION_STRING from version.h

Browse Source 
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>
This commit is contained in:
Pali Rohár 2021-08-02 15:18:37 +02:00 committed by Tom Rini
parent fd00495080
commit bc21ccbaaa
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/version.c
View File

@ -13,6 +13,9 @@
#include <asm/cb_sysinfo.h> #include <asm/cb_sysinfo.h>
#endif #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; const char version_string[] = U_BOOT_VERSION_STRING;
static int do_version(struct cmd_tbl *cmdtp, int flag, int argc, static int do_version(struct cmd_tbl *cmdtp, int flag, int argc,

21
doc/develop/version.rst
View File

@ -60,15 +60,6 @@ The following are available:
This is used as part of the banner string when U-Boot starts. 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) U_BOOT_VERSION_NUM (integer #define)
Release year, e.g. 2021 for release 2021.01. Note Release year, e.g. 2021 for release 2021.01. Note
this is an integer, not a string. 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 Patch number, e.g. 1 for release 2020.01. Note
this is an integer, not a string. 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 Build date/time is also included. See the generated file
include/generated/timestamp_autogenerated.h for the available include/generated/timestamp_autogenerated.h for the available
fields. For example:: fields. For example::

3
include/version.h
View File

@ -13,7 +13,4 @@
#include "generated/version_autogenerated.h" #include "generated/version_autogenerated.h"
#endif #endif
#define U_BOOT_VERSION_STRING U_BOOT_VERSION " (" U_BOOT_DATE " - " \
U_BOOT_TIME " " U_BOOT_TZ ")" CONFIG_IDENT_STRING
#endif /* __VERSION_H__ */ #endif /* __VERSION_H__ */