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

Merge changes I32bd0c71,I167e7398 into integration

Browse source 
* changes:
  fix(arm): don't race on the build directory
  fix(armada): don't race on the UART_IMAGE
This commit is contained in:
Manish V Badarkhe 2025-02-12 16:25:49 +01:00 • committed by TrustedFirmware Code Review
commit d0a0d61e5b
2 changed files with 6 additions and 6 deletions
plat
arm/board/common
board_common.mk
marvell/armada/a3k/common
a3700_common.mk

6
plat/arm/board/common/board_common.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2015-2024, Arm Limited and Contributors. All rights reserved. # Copyright (c) 2015-2025, Arm Limited and Contributors. All rights reserved.
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -148,14 +148,14 @@ $(BUILD_PLAT)/bl2/arm_dev_protpk.o: $(ARM_PROTPK)
$(BUILD_PLAT)/bl2/arm_dev_swd_rotpk.o: $(ARM_SWD_ROTPK) $(BUILD_PLAT)/bl2/arm_dev_swd_rotpk.o: $(ARM_SWD_ROTPK)
endif endif
$(ARM_PROTPK): $(ARM_PROT_KEY) $(ARM_PROTPK): $(ARM_PROT_KEY) | $$(@D)/
ifndef ARM_PROT_KEY ifndef ARM_PROT_KEY
$(error Cannot generate hash: no PROT_KEY defined) $(error Cannot generate hash: no PROT_KEY defined)
endif endif
${OPENSSL_BIN_PATH}/openssl ${CRYPTO_ALG} -in ${ARM_PROT_KEY} -pubout -outform DER | \ ${OPENSSL_BIN_PATH}/openssl ${CRYPTO_ALG} -in ${ARM_PROT_KEY} -pubout -outform DER | \
${OPENSSL_BIN_PATH}/openssl dgst -${HASH_ALG} -binary -out $@ ${OPENSSL_BIN_PATH}/openssl dgst -${HASH_ALG} -binary -out $@
$(ARM_SWD_ROTPK): $(ARM_SWD_ROT_KEY) $(ARM_SWD_ROTPK): $(ARM_SWD_ROT_KEY) | $$(@D)/
ifndef ARM_SWD_ROT_KEY ifndef ARM_SWD_ROT_KEY
$(error Cannot generate hash: no SWD_KEY defined) $(error Cannot generate hash: no SWD_KEY defined)
endif endif

6
plat/marvell/armada/a3k/common/a3700_common.mk
View file

@ -74,6 +74,9 @@ ifeq ($(A3720_DB_PM_WAKEUP_SRC),1)
BL31_SOURCES += $(PLAT_FAMILY_BASE)/$(PLAT)/board/pm_src.c BL31_SOURCES += $(PLAT_FAMILY_BASE)/$(PLAT)/board/pm_src.c
endif endif
BUILD_UART := uart-images
UART_IMAGE := $(BUILD_UART).tgz.bin
ifdef WTP ifdef WTP
# Do not remove! Following checks are required to ensure correct TF-A builds, removing these checks leads to broken TF-A builds # Do not remove! Following checks are required to ensure correct TF-A builds, removing these checks leads to broken TF-A builds
@ -82,9 +85,6 @@ $(if $(shell git -C $(value WTP) rev-parse --show-cdup 2>&1),$(error "'WTP=$(val
TBB := $(WTP)/wtptp/src/TBB_Linux/release/TBB_linux TBB := $(WTP)/wtptp/src/TBB_Linux/release/TBB_linux
BUILD_UART := uart-images
UART_IMAGE := $(BUILD_UART).tgz.bin
ifeq ($(MARVELL_SECURE_BOOT),1) ifeq ($(MARVELL_SECURE_BOOT),1)
TIM_CFG := $(BUILD_PLAT)/atf-tim.txt TIM_CFG := $(BUILD_PLAT)/atf-tim.txt
TIM_UART_CFG := $(BUILD_PLAT)/$(BUILD_UART)/atf-tim.txt TIM_UART_CFG := $(BUILD_PLAT)/$(BUILD_UART)/atf-tim.txt