aboutsummaryrefslogtreecommitdiff
path: root/platform/CMakeLists.txt
diff options
context:
space:
mode:
authorMichel Jaouen <michel.jaouen@st.com>2020-09-25 14:24:45 +0200
committerAnton Komlev <Anton.Komlev@arm.com>2020-10-20 13:15:15 +0000
commit4dc24425df00edfe26f2fc2b46e5a4ee4351b749 (patch)
tree63680e5f9dbba9f284de1b3de11387351dbab364 /platform/CMakeLists.txt
parentc6e8936a9963511f2f78b00fb303019635d36bef (diff)
downloadtrusted-firmware-m-4dc24425df00edfe26f2fc2b46e5a4ee4351b749.tar.gz
Build: Remove platform_bl2 in secure library link
lib platform_bl2 is for linking bl2 only. tfm_s links with lib platform_s Change-Id: I5f76db8bb74945dd6f463a3febaf45d04a3e84f8 Signed-off-by: Michel Jaouen <michel.jaouen@st.com> Signed-off-by: Raef Coles <raef.coles@arm.com>
Diffstat (limited to 'platform/CMakeLists.txt')
-rw-r--r--platform/CMakeLists.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt
index 50e761320d..8895552abf 100644
--- a/platform/CMakeLists.txt
+++ b/platform/CMakeLists.txt
@@ -47,6 +47,7 @@ target_sources(platform_s
$<$<BOOL:${PLATFORM_DUMMY_ATTEST_HAL}>:ext/common/template/attest_hal.c>
$<$<BOOL:${PLATFORM_DUMMY_NV_COUNTERS}>:ext/common/template/nv_counters.c>
$<$<BOOL:${PLATFORM_DUMMY_CRYPTO_KEYS}>:ext/common/template/crypto_keys.c>
+ $<$<BOOL:${PLATFORM_DUMMY_ROTPK}>:ext/common/template/tfm_rotpk.c>
$<$<BOOL:${PLATFORM_DUMMY_IAK}>:ext/common/template/tfm_initial_attestation_key_material.c>
)
@@ -56,7 +57,6 @@ target_link_libraries(platform_s
PRIVATE
psa_interface
tfm_secure_api
- $<$<BOOL:${BL2}>:platform_bl2>
tfm_arch
)
@@ -135,9 +135,6 @@ if(BL2)
target_compile_definitions(platform_bl2
PUBLIC
BL2
- MCUBOOT_IMAGE_NUMBER=${MCUBOOT_IMAGE_NUMBER}
- $<$<STREQUAL:${MCUBOOT_SIGNATURE_TYPE},RSA>:MCUBOOT_SIGN_RSA>
- $<$<STREQUAL:${MCUBOOT_SIGNATURE_TYPE},RSA>:MCUBOOT_SIGN_RSA_LEN=${MCUBOOT_SIGNATURE_KEY_LEN}>
MCUBOOT_${MCUBOOT_UPGRADE_STRATEGY}
$<$<BOOL:${SYMMETRIC_INITIAL_ATTESTATION}>:SYMMETRIC_INITIAL_ATTESTATION>
$<$<BOOL:${MCUBOOT_HW_KEY}>:MCUBOOT_HW_KEY>
@@ -153,7 +150,9 @@ target_compile_definitions(platform_region_defs
$<$<BOOL:${BL2}>:BL2>
$<$<BOOL:${SECURE_UART1}>:SECURE_UART1>
DAUTH_${DEBUG_AUTHENTICATION}
- $<$<BOOL:${BL2}>:MCUBOOT_IMAGE_NUMBER=${MCUBOOT_IMAGE_NUMBER}>
+ MCUBOOT_IMAGE_NUMBER=${MCUBOOT_IMAGE_NUMBER}
+ $<$<STREQUAL:${MCUBOOT_SIGNATURE_TYPE},RSA>:MCUBOOT_SIGN_RSA>
+ $<$<STREQUAL:${MCUBOOT_SIGNATURE_TYPE},RSA>:MCUBOOT_SIGN_RSA_LEN=${MCUBOOT_SIGNATURE_KEY_LEN}>
$<$<STREQUAL:${MCUBOOT_EXECUTION_SLOT},2>:LINK_TO_SECONDARY_PARTITION>
$<$<BOOL:${TEST_PSA_API}>:PSA_API_TEST_${TEST_PSA_API}>
)