aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2020-05-28 08:06:57 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-05-28 08:06:57 +0000
commit09aef7b9f483cdf53c9c09ddb2796382d236bcd6 (patch)
treed9945fd2a381e6938748b3a4ddf4a22d5f345985
parent85dd0c9c9b80b36a537ecedbed9eb75dd2112eeb (diff)
parentb58956e976626b80508a95d3521c4b70ac31f9c9 (diff)
downloadtrusted-firmware-a-09aef7b9f483cdf53c9c09ddb2796382d236bcd6.tar.gz
Merge "Fix the build error for dualroot chain of trust." into integration
-rw-r--r--plat/arm/common/arm_common.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk
index a287368080..a92bf2578f 100644
--- a/plat/arm/common/arm_common.mk
+++ b/plat/arm/common/arm_common.mk
@@ -298,6 +298,8 @@ ifneq (${TRUSTED_BOARD_BOOT},0)
# Include the selected chain of trust sources.
ifeq (${COT},tbbr)
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)
AUTH_SOURCES += drivers/auth/dualroot/cot.c
else
@@ -307,12 +309,10 @@ ifneq (${TRUSTED_BOARD_BOOT},0)
BL1_SOURCES += ${AUTH_SOURCES} \
bl1/tbbr/tbbr_img_desc.c \
plat/arm/common/arm_bl1_fwu.c \
- drivers/auth/tbbr/tbbr_cot_bl1.c \
plat/common/tbbr/plat_tbbr.c
BL2_SOURCES += ${AUTH_SOURCES} \
- plat/common/tbbr/plat_tbbr.c \
- drivers/auth/tbbr/tbbr_cot_bl2.c
+ plat/common/tbbr/plat_tbbr.c
$(eval $(call TOOL_ADD_IMG,ns_bl2u,--fwu,FWU_))