Hotfix: Fix Secure Enclave build
- Put Secure Enclave secure API into tfm_sprt library
- Fix the include directory of mcuboot_config.h in Musca-B1 Secure
Enclave
Change-Id: Ie3c38b5b9b70e6c819f6bb9262ceec6e87e00770
Signed-off-by: David Hu <david.hu@arm.com>
diff --git a/platform/ext/target/musca_b1/secure_enclave/CMakeLists.txt b/platform/ext/target/musca_b1/secure_enclave/CMakeLists.txt
index 2f0f303..32a8cc4 100644
--- a/platform/ext/target/musca_b1/secure_enclave/CMakeLists.txt
+++ b/platform/ext/target/musca_b1/secure_enclave/CMakeLists.txt
@@ -122,7 +122,7 @@
Device/Config
Native_Driver
${MCUBOOT_PATH}/boot/bootutil/include # for fault_injection_hardening.h only
- ${CMAKE_CURRENT_BINARY_DIR}/../../../../../bl2/ext/mcuboot # for mcuboot_con
+ ${CMAKE_BINARY_DIR}/bl2/ext/mcuboot # for mcuboot_config.h only
${CMAKE_MUSCA_B1_COMMON_DIR}/Native_Driver
${CMAKE_MUSCA_B1_COMMON_DIR}/Libraries
)
diff --git a/secure_fw/partitions/psa_proxy/CMakeLists.txt b/secure_fw/partitions/psa_proxy/CMakeLists.txt
index ffbc778..5f0aeb5 100644
--- a/secure_fw/partitions/psa_proxy/CMakeLists.txt
+++ b/secure_fw/partitions/psa_proxy/CMakeLists.txt
@@ -40,7 +40,7 @@
############################ Secure API ########################################
-target_sources(tfm_secure_api
+target_sources(tfm_sprt
PRIVATE
../crypto/tfm_crypto_secure_api.c
../initial_attestation/tfm_attest_secure_api.c