diff options
author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2020-01-30 13:58:10 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-01-30 13:58:10 +0000 |
commit | dcd03ce7bb9ba385970a3bdaf6ec10716969fde5 (patch) | |
tree | c07c1bab5f590b0c16c10e9478e1708634242d4b /plat | |
parent | b1d810bd212d1eee5c2f3ab927e2689c2e460dab (diff) | |
parent | 3bff910dc16ad5ed97d470064b25481d3674732b (diff) | |
download | arm-trusted-firmware-dcd03ce7bb9ba385970a3bdaf6ec10716969fde5.tar.gz |
Merge changes from topic "sb/select-cot" into integration
* changes:
Introduce COT build option
cert_create: Remove references to TBBR in common code
cert_create: Introduce COT build option
cert_create: Introduce TBBR CoT makefile
Diffstat (limited to 'plat')
-rw-r--r-- | plat/arm/common/arm_common.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk index 9d4f05e9e..c8b7ab448 100644 --- a/plat/arm/common/arm_common.mk +++ b/plat/arm/common/arm_common.mk @@ -1,5 +1,5 @@ # -# Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -254,7 +254,13 @@ ifneq (${TRUSTED_BOARD_BOOT},0) AUTH_SOURCES := drivers/auth/auth_mod.c \ drivers/auth/crypto_mod.c \ drivers/auth/img_parser_mod.c \ - drivers/auth/tbbr/tbbr_cot.c \ + + # Include the selected chain of trust sources. + ifeq (${COT},tbbr) + AUTH_SOURCES += drivers/auth/tbbr/tbbr_cot.c + else + $(error Unknown chain of trust ${COT}) + endif BL1_SOURCES += ${AUTH_SOURCES} \ bl1/tbbr/tbbr_img_desc.c \ |