f2bd43c79d
TF-A prints a version string at boot which includes the version number as
specified in the Makefile and additional "build" information, specified by
the BUILD_STRING parameter:
https://trustedfirmware-a.readthedocs.io/en/v2.9/getting_started/build-options.html
BUILD_STRING: Input string for VERSION_STRING, which allows the TF-A build
to be uniquely identified. Defaults to the current git commit id.
This is implemented as:
# Default build string (git branch and commit)
ifeq (${BUILD_STRING},)
BUILD_STRING := $(shell git describe --always --dirty --tags 2> /dev/null)
endif
https://github.com/ARM-software/arm-trusted-firmware/blob/master/Makefile#L225-L228
Which is never correct in the context of Buildroot, as the TF-A build
directory is never a git repo, and git will move up the directory tree and
possibly and (possibly) pick up the git version of Buildroot instead.
To fix that, explicitly set BUILD_STRING to the version of the package.
Pass it before BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES so it
can still be overridden by the user if needed.
strings images/tf-a-* | egrep '^v2\.'
v2.9(debug):2023.08-859-g99d78b52a0
v2.9(debug):v2.9
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| afboot-stm32 | ||
| arm-trusted-firmware | ||
| at91bootstrap | ||
| at91bootstrap3 | ||
| at91dataflashboot | ||
| barebox | ||
| beaglev-ddrinit | ||
| beaglev-secondboot | ||
| binaries-marvell | ||
| boot-wrapper-aarch64 | ||
| edk2 | ||
| grub2 | ||
| mv-ddr-marvell | ||
| mxs-bootlets | ||
| opensbi | ||
| optee-os | ||
| s500-bootloader | ||
| shim | ||
| syslinux | ||
| ti-k3-r5-loader | ||
| uboot | ||
| vexpress-firmware | ||
| common.mk | ||
| Config.in | ||