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

Merge "Fix the build error for dualroot chain of trust." into integration

Browse source
This commit is contained in:
Sandrine Bailleux 2020-05-28 08:06:57 +00:00 • committed by TrustedFirmware Code Review
commit 09aef7b9f4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plat/arm/common/arm_common.mk
View file

@ -298,6 +298,8 @@ ifneq (${TRUSTED_BOARD_BOOT},0)
# Include the selected chain of trust sources. # Include the selected chain of trust sources.
ifeq (${COT},tbbr) ifeq (${COT},tbbr)
AUTH_SOURCES += drivers/auth/tbbr/tbbr_cot_common.c AUTH_SOURCES += drivers/auth/tbbr/tbbr_cot_common.c
BL1_SOURCES += drivers/auth/tbbr/tbbr_cot_bl1.c
BL2_SOURCES += drivers/auth/tbbr/tbbr_cot_bl2.c
else ifeq (${COT},dualroot) else ifeq (${COT},dualroot)
AUTH_SOURCES += drivers/auth/dualroot/cot.c AUTH_SOURCES += drivers/auth/dualroot/cot.c
else else
@ -307,12 +309,10 @@ ifneq (${TRUSTED_BOARD_BOOT},0)
BL1_SOURCES += ${AUTH_SOURCES} \ BL1_SOURCES += ${AUTH_SOURCES} \
bl1/tbbr/tbbr_img_desc.c \ bl1/tbbr/tbbr_img_desc.c \
plat/arm/common/arm_bl1_fwu.c \ plat/arm/common/arm_bl1_fwu.c \
drivers/auth/tbbr/tbbr_cot_bl1.c \
plat/common/tbbr/plat_tbbr.c plat/common/tbbr/plat_tbbr.c
BL2_SOURCES += ${AUTH_SOURCES} \ BL2_SOURCES += ${AUTH_SOURCES} \
plat/common/tbbr/plat_tbbr.c \ plat/common/tbbr/plat_tbbr.c
drivers/auth/tbbr/tbbr_cot_bl2.c
$(eval $(call TOOL_ADD_IMG,ns_bl2u,--fwu,FWU_)) $(eval $(call TOOL_ADD_IMG,ns_bl2u,--fwu,FWU_))