[PATCH] build: allow a downstream suffix in the version shown during boot

[Nicolas Boulenguez <nicolas@debian.org>]

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

Hello.

The attached patch has been applied for a while by Debian, but would
most probably be useful to other downstreams.
It is trivial and does not change the default settings.

Please consider merging it upstream.
Thanks.

[-- Attachment #2: 0001-build-allow-a-downstream-suffix-in-the-version-shown.patch --]
[-- Type: text/x-diff, Size: 2066 bytes --]

From 5a08cdc84ade21b947f1de8aa95e3bbd273c4bcd Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas@debian.org>
Date: Thu, 10 Feb 2022 11:15:38 +0100
Subject: [PATCH] build: allow a downstream suffix in the version shown during
 boot

It is convenient for redistributors to add a build number to the
U-boot source version, which is displayed at boot and useful to know
if a device has been successfully updated, to triage bugs and so on.

For example, Debian adds '+dfsg-N' where N changes with each release
of a .deb package.

Author: Vagrant Cascadian <vagrant@debian.org>
Author: Nicolas Boulenguez <nicolas@debian.org>
Signed-By: Nicolas Boulenguez <nicolas@debian.org>
---
 Makefile          | 2 +-
 doc/build/gcc.rst | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a30098c66f..d6e9cdbf04 100644
--- a/Makefile
+++ b/Makefile
@@ -456,7 +456,7 @@ KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)
 
 # Read UBOOTRELEASE from include/config/uboot.release (if it exists)
 UBOOTRELEASE = $(shell cat include/config/uboot.release 2> /dev/null)
-UBOOTVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
+UBOOTVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)$(BUILD_VERSION)
 
 export VERSION PATCHLEVEL SUBLEVEL UBOOTRELEASE UBOOTVERSION
 export ARCH CPU BOARD VENDOR SOC CPUDIR BOARDDIR
diff --git a/doc/build/gcc.rst b/doc/build/gcc.rst
index cdd7970032..d8666acaae 100644
--- a/doc/build/gcc.rst
+++ b/doc/build/gcc.rst
@@ -141,6 +141,11 @@ of dtc is new enough. It also makes sure that pylibfdt is present, if needed
 Note that the :doc:`tools` are always built with the included version of libfdt
 so it is not possible to build U-Boot tools with a system libfdt, at present.
 
+If you are modifying the upstream sources, please make this visible
+at boot time by defining the BUILD_VERSION version suffix.
+
+* BUILD_VERSION=+<vendor><build number><...>
+
 Other build targets
 ~~~~~~~~~~~~~~~~~~~
 
-- 
2.30.2