From: "Pali Rohár" <pali@kernel.org>
To: "Simon Glass" <sjg@chromium.org>,
"Heinrich Schuchardt" <xypron.glpk@gmx.de>,
"Alexander Graf" <agraf@csgraf.de>,
"Huan Wang" <alison.wang@nxp.com>,
"Angelo Dureghello" <angelo@sysam.it>,
"Wolfgang Denk" <wd@denx.de>,
"Priyanka Jain" <priyanka.jain@nxp.com>,
"Christophe Leroy" <christophe.leroy@c-s.fr>,
"Bin Meng" <bmeng.cn@gmail.com>,
"Marek Behún" <marek.behun@nic.cz>,
"Tom Rini" <trini@konsulko.com>
Cc: u-boot@lists.denx.de
Subject: [PATCH 10/11] version: Remove global macro U_BOOT_VERSION_STRING from version.h
Date: Mon, 2 Aug 2021 15:18:37 +0200 [thread overview]
Message-ID: <20210802131838.21097-11-pali@kernel.org> (raw)
In-Reply-To: <20210802131838.21097-1-pali@kernel.org>
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(-)
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__ */
--
2.20.1
next prev parent reply other threads:[~2021-08-02 13:21 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-02 13:18 [PATCH 00/11] Reduce usage of timestamp macros Pali Rohár
2021-08-02 13:18 ` [PATCH 01/11] Remove #include <timestamp.h> from files which do not need it Pali Rohár
2021-08-02 13:58 ` Tom Rini
2021-09-23 2:07 ` Tom Rini
2021-08-02 13:18 ` [PATCH 02/11] Remove #include <version.h> " Pali Rohár
2021-08-02 13:58 ` Tom Rini
2021-09-23 2:07 ` Tom Rini
2021-08-02 13:18 ` [PATCH 03/11] efi_loader: Use directly version_string variable Pali Rohár
2021-08-02 20:04 ` Heinrich Schuchardt
2021-08-03 7:37 ` Ilias Apalodimas
2021-09-23 2:07 ` Tom Rini
2021-08-02 13:18 ` [PATCH 04/11] version: Move version_string[] from version.h to version_string.h Pali Rohár
2021-08-02 13:58 ` Tom Rini
2021-09-23 2:08 ` Tom Rini
2021-08-02 13:18 ` [PATCH 05/11] m68k: mcf: Remove overloading version_string Pali Rohár
2021-09-23 2:08 ` Tom Rini
2021-08-02 13:18 ` [PATCH 06/11] version: Put version_string[] variable into section .text_version_string Pali Rohár
2021-08-02 13:58 ` Tom Rini
2021-09-16 17:30 ` [PATCH] xtensa: Put U-Boot version string at correct place by linker script Tom Rini
2021-09-16 19:38 ` Francesco Dolcini
2021-09-16 19:42 ` Tom Rini
2021-09-16 19:50 ` Francesco Dolcini
2021-09-16 20:13 ` Tom Rini
2021-09-16 20:23 ` Francesco Dolcini
2021-09-17 5:21 ` Max Filippov
2021-09-17 12:02 ` Tom Rini
2021-09-17 5:14 ` Max Filippov
2021-09-17 12:04 ` Tom Rini
2021-09-17 12:30 ` Max Filippov
2021-08-02 13:18 ` [PATCH 07/11] powerpc: mpc: " Pali Rohár
2021-08-08 11:20 ` [PATCH v2] " Pali Rohár
2021-08-08 11:36 ` Pali Rohár
2021-08-24 5:03 ` Christophe Leroy
2021-08-24 9:46 ` Wolfgang Denk
2021-08-24 5:28 ` Christophe Leroy
2021-08-24 11:28 ` Pali Rohár
2021-09-16 19:17 ` Tom Rini
2021-09-16 19:56 ` [PATCH 1/1] powerpc: Drop version_string placement optimization Tom Rini
2021-09-23 2:09 ` Tom Rini
2021-08-02 13:18 ` [PATCH 08/11] version: Do not make version_string[] variable as a weak Pali Rohár
2021-08-02 13:58 ` Tom Rini
2021-09-23 2:08 ` Tom Rini
2021-08-02 13:18 ` [PATCH 09/11] x86: quark: MRC: Remove U_BOOT_DATE and U_BOOT_TIME from debug log Pali Rohár
2021-08-02 19:21 ` Simon Glass
2021-08-02 23:25 ` Bin Meng
2021-09-23 2:08 ` Tom Rini
2021-08-02 13:18 ` Pali Rohár [this message]
2021-08-02 13:59 ` [PATCH 10/11] version: Remove global macro U_BOOT_VERSION_STRING from version.h Tom Rini
2021-09-23 2:08 ` Tom Rini
2021-08-02 13:18 ` [PATCH 11/11] Remove including timestamp.h in version.h Pali Rohár
2021-08-02 19:21 ` Simon Glass
2021-08-02 19:42 ` Pali Rohár
2021-08-02 21:31 ` Tom Rini
2021-08-04 5:59 ` Wolfgang Denk
2021-08-04 12:44 ` Tom Rini
2021-08-04 14:36 ` Simon Glass
2021-08-04 14:40 ` Tom Rini
2021-08-04 21:46 ` Pali Rohár
2021-08-04 21:43 ` Sean Anderson
2021-08-04 21:52 ` Pali Rohár
2021-08-04 22:09 ` Tom Rini
2021-08-04 22:14 ` Pali Rohár
2021-08-04 22:15 ` Tom Rini
2021-08-04 22:22 ` Pali Rohár
2021-09-23 2:08 ` Tom Rini
2021-08-17 11:02 ` [PATCH 00/11] Reduce usage of timestamp macros Pali Rohár
2021-08-17 13:40 ` Tom Rini
2021-09-01 20:59 ` Tom Rini
2021-09-01 21:05 ` Pali Rohár
2021-09-01 21:17 ` Tom Rini
2021-09-01 21:28 ` Pali Rohár
2021-09-01 21:33 ` Tom Rini
2021-09-01 21:44 ` Pali Rohár
2021-09-01 21:49 ` Pali Rohár
2021-09-10 20:56 ` Pali Rohár
2021-09-10 21:18 ` Tom Rini
2021-09-01 21:56 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210802131838.21097-11-pali@kernel.org \
--to=pali@kernel.org \
--cc=agraf@csgraf.de \
--cc=alison.wang@nxp.com \
--cc=angelo@sysam.it \
--cc=bmeng.cn@gmail.com \
--cc=christophe.leroy@c-s.fr \
--cc=marek.behun@nic.cz \
--cc=priyanka.jain@nxp.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=wd@denx.de \
--cc=xypron.glpk@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.