aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaef Coles <raef.coles@arm.com>2022-04-01 17:12:35 +0100
committerDavid Hu <david.hu@arm.com>2022-07-01 11:14:07 +0200
commitc16eae6e908a2e4b2aa58bc18ed8218b739daa59 (patch)
treecf1acb138a7bb84629b32c050168feafbaa53041
parentf71145380cf0ec59c555e25ed9c8a6f7d55c77a7 (diff)
downloadtrusted-firmware-m-c16eae6e908a2e4b2aa58bc18ed8218b739daa59.tar.gz
Build: Change OTP backend selection
No longer automatically use CC312 OTP if the accelerator is enabled, to allow platforms to use the CC312 for cryptographic acceleration only with another hardware OTP provider. Change-Id: I44fc439ba47f6d7e004f266b3844903e7719c34b Signed-off-by: Raef Coles <raef.coles@arm.com>
-rw-r--r--platform/ext/accelerator/cc312/CMakeLists.txt15
-rw-r--r--platform/ext/target/arm/corstone1000/CMakeLists.txt2
2 files changed, 2 insertions, 15 deletions
diff --git a/platform/ext/accelerator/cc312/CMakeLists.txt b/platform/ext/accelerator/cc312/CMakeLists.txt
index bf97a26a2d..9535fd1bc2 100644
--- a/platform/ext/accelerator/cc312/CMakeLists.txt
+++ b/platform/ext/accelerator/cc312/CMakeLists.txt
@@ -20,20 +20,6 @@ if(BL2)
)
endif()
-################################ OTP ###########################################
-
-target_sources(platform_s
- PRIVATE
- $<$<NOT:$<BOOL:${PLATFORM_DEFAULT_OTP}>>:${CMAKE_CURRENT_SOURCE_DIR}/otp_cc312.c>
-)
-
-if(BL2)
- target_sources(platform_bl2
- PRIVATE
- $<$<NOT:$<BOOL:${PLATFORM_DEFAULT_OTP}>>:${CMAKE_CURRENT_SOURCE_DIR}/otp_cc312.c>
- )
-endif()
-
################################ BL1 ###########################################
if(BL1 AND PLATFORM_DEFAULT_BL1)
@@ -44,7 +30,6 @@ if(BL1 AND PLATFORM_DEFAULT_BL1)
./cc312_rom_crypto_hw.c
$<$<NOT:$<BOOL:${TFM_BL1_SOFTWARE_CRYPTO}>>:${CMAKE_CURRENT_SOURCE_DIR}/bl1/cc312_rom_crypto.c>
$<$<NOT:$<BOOL:${TFM_BL1_DUMMY_TRNG}>>:${CMAKE_CURRENT_SOURCE_DIR}/bl1/cc312_rom_trng.c>
- $<$<NOT:$<BOOL:${PLATFORM_DEFAULT_OTP}>>:${CMAKE_CURRENT_SOURCE_DIR}/otp_cc312.c>
)
target_link_libraries(bl1_crypto_hw
diff --git a/platform/ext/target/arm/corstone1000/CMakeLists.txt b/platform/ext/target/arm/corstone1000/CMakeLists.txt
index 81522c7cf0..cc4547accc 100644
--- a/platform/ext/target/arm/corstone1000/CMakeLists.txt
+++ b/platform/ext/target/arm/corstone1000/CMakeLists.txt
@@ -76,6 +76,7 @@ target_sources(platform_s
fw_update_agent/uefi_capsule_parser.c
fw_update_agent/fwu_agent.c
$<$<BOOL:${TFM_S_REG_TEST}>:${CMAKE_CURRENT_SOURCE_DIR}/target_cfg.c>
+ $<$<NOT:$<BOOL:${PLATFORM_DEFAULT_OTP}>>:${PLATFORM_DIR}/ext/accelerator/cc312/otp_cc312.c>
)
if (PLATFORM_IS_FVP)
@@ -116,6 +117,7 @@ target_sources(platform_bl2
fip_parser/fip_parser.c
fw_update_agent/fwu_agent.c
bl2_security_cnt.c
+ $<$<NOT:$<BOOL:${PLATFORM_DEFAULT_OTP}>>:${PLATFORM_DIR}/ext/accelerator/cc312/otp_cc312.c>
)
if (PLATFORM_IS_FVP)