diff mbox series

[10/11] version: Remove global macro U_BOOT_VERSION_STRING from version.h

Message ID 20210802131838.21097-11-pali@kernel.org
State Accepted
Delegated to: Tom Rini
Headers show
Series Reduce usage of timestamp macros | expand

Commit Message

Pali Rohár Aug. 2, 2021, 1:18 p.m. UTC 
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>
---
 cmd/version.c           |  3 +++
 doc/develop/version.rst | 21 ++++++++++++---------
 include/version.h       |  3 ---
 3 files changed, 15 insertions(+), 12 deletions(-)

Comments

Tom Rini Aug. 2, 2021, 1:59 p.m. UTC | #1 
On Mon, Aug 02, 2021 at 03:18:37PM +0200, Pali Rohár wrote:

> 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>
Tom Rini Sept. 23, 2021, 2:08 a.m. UTC | #2 
On Mon, Aug 02, 2021 at 03:18:37PM +0200, Pali Rohár wrote:

> 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>

Applied to u-boot/next, thanks!
diff mbox series

Patch

diff --git a/cmd/version.c b/cmd/version.c
index 38a26552a148..42eb85b75bb7 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[] __section(".text_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 3f2b07cd2261..5c9046aa17aa 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 0a3b29adb89a..8ee07134fd2f 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__ */