Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-18 02:24:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build(encrypt-fw): don't generate build_msg.c

Browse source 
This change avoids generating a build message source file on the shell,
instead using the `__DATE__` and `__TIME__` macros directly.

Change-Id: Ida537d4c3e550f2fbbd977472ed6573491d17c23
Signed-off-by: Chris Kay <chris.kay@arm.com>
This commit is contained in:
Chris Kay 2024-06-14 11:31:03 +00:00
parent a004ee8de7
commit 415049a25f
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog.yaml
View file

@ -1416,6 +1416,9 @@ subsections:
- title: Certificate Creation Tool - title: Certificate Creation Tool
scope: cert-create scope: cert-create
- title: Firmware Encryption Tool
scope: encrypt-fw
- title: Memory Mapping Tool - title: Memory Mapping Tool
scope: memmap scope: memmap

7
tools/encrypt_fw/Makefile
View file

@ -1,4 +1,5 @@
# #
# Copyright (c) 2024, Arm Limited. All rights reserved.
# Copyright (c) 2019-2022, Linaro Limited. All rights reserved. # Copyright (c) 2019-2022, Linaro Limited. All rights reserved.
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
@ -64,9 +65,7 @@ all: --openssl ${BINARY}
${BINARY}: ${OBJECTS} Makefile ${BINARY}: ${OBJECTS} Makefile
$(s)echo " HOSTLD $@" $(s)echo " HOSTLD $@"
$(q)echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__;' | \ $(q)$(host-cc) ${OBJECTS} ${LIB_DIR} ${LIB} -o $@
$(host-cc) -c ${HOSTCCFLAGS} -xc - -o src/build_msg.o
$(q)$(host-cc) src/build_msg.o ${OBJECTS} ${LIB_DIR} ${LIB} -o $@
%.o: %.c %.o: %.c
$(s)echo " HOSTCC $<" $(s)echo " HOSTCC $<"
@ -78,7 +77,7 @@ ifeq ($(DEBUG),1)
endif endif
clean: clean:
$(call SHELL_DELETE_ALL, src/build_msg.o ${OBJECTS}) $(call SHELL_DELETE_ALL,${OBJECTS})
realclean: clean realclean: clean
$(call SHELL_DELETE,${BINARY}) $(call SHELL_DELETE,${BINARY})

4
tools/encrypt_fw/src/main.c
View file

@ -1,4 +1,5 @@
/* /*
* Copyright (c) 2024, Arm Limited and Contributors. All rights reserved.
* Copyright (c) 2019, Linaro Limited. All rights reserved. * Copyright (c) 2019, Linaro Limited. All rights reserved.
* Author: Sumit Garg <sumit.garg@linaro.org> * Author: Sumit Garg <sumit.garg@linaro.org>
* *
@ -25,8 +26,7 @@
/* Global options */ /* Global options */
/* Info messages created in the Makefile */ static const char build_msg[] = "Built : " __TIME__ ", " __DATE__;
extern const char build_msg[];
static char *key_algs_str[] = { static char *key_algs_str[] = {
[KEY_ALG_GCM] = "gcm", [KEY_ALG_GCM] = "gcm",