diff options
| author | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2022-08-11 18:02:30 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2022-08-11 18:02:30 +0200 |
| commit | 8f23476e391a57ba8d6dbe781f4a5b012a117e40 (patch) | |
| tree | e0e18da49b2c6c345cfd01e2b1626ed8784cbce8 /make_helpers | |
| parent | f924258da7f016f685e72a71b72109de53c52541 (diff) | |
| parent | dddf4283b043ad0a81d27bd5bb2f0c647c511e11 (diff) | |
| download | arm-trusted-firmware-8f23476e391a57ba8d6dbe781f4a5b012a117e40.tar.gz | |
Merge "feat(bl): add interface to query TF-A semantic ver" into integration
Diffstat (limited to 'make_helpers')
| -rw-r--r-- | make_helpers/build_macros.mk | 3 | ||||
| -rw-r--r-- | make_helpers/windows.mk | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index a58caf565..abdd4d069 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -499,7 +499,8 @@ ifdef MAKE_BUILD_STRINGS $(call MAKE_BUILD_STRINGS, $(BUILD_DIR)/build_message.o) else @echo 'const char build_message[] = "Built : "$(BUILD_MESSAGE_TIMESTAMP); \ - const char version_string[] = "${VERSION_STRING}";' | \ + const char version_string[] = "${VERSION_STRING}"; \ + const char version[] = "${VERSION}";' | \ $$(CC) $$(TF_CFLAGS) $$(CFLAGS) -xc -c - -o $(BUILD_DIR)/build_message.o endif ifneq ($(findstring armlink,$(notdir $(LD))),) diff --git a/make_helpers/windows.mk b/make_helpers/windows.mk index 26ea88ef0..0f78f61a7 100644 --- a/make_helpers/windows.mk +++ b/make_helpers/windows.mk @@ -1,5 +1,5 @@ # -# Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2016-2022, Arm Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -81,6 +81,7 @@ BUILD_STRING ?= development build # by defining the MAKE_BUILD_STRINGS macro. BUILT_TIME_DATE_STRING = const char build_message[] = "Built : "${BUILD_MESSAGE_TIMESTAMP}; VERSION_STRING_MESSAGE = const char version_string[] = "${VERSION_STRING}"; +const char version[] = "${VERSION}"; define MAKE_BUILD_STRINGS @echo $$(BUILT_TIME_DATE_STRING) $$(VERSION_STRING_MESSAGE) | \ $$(CC) $$(TF_CFLAGS) $$(CFLAGS) -x c -c - -o $1 |