aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSummer Qin <summer.qin@arm.com>2021-07-22 18:28:07 +0800
committerKen Liu <ken.liu@arm.com>2021-07-26 07:51:35 +0200
commit8531f8439afbc67727c5733ed03d38fc315bb69b (patch)
tree9d131f2f0d45d538e8053462acd9cbbdeb4cebf8
parent1c983653498f4fbef1a771f964da2dee3f8bbdec (diff)
downloadtrusted-firmware-m-8531f8439afbc67727c5733ed03d38fc315bb69b.tar.gz
Crypto: Add config check
PLATFORM_DUMMY_NV_SEED and CRYPTO_HW_ACCELERATOR should not be disabled at the same time. Only one of them should be set to ON. Change-Id: I1c0c5b187734e3a49b0cea9a3562693bd1d0e11c Signed-off-by: Summer Qin <summer.qin@arm.com>
-rw-r--r--config/check_config.cmake1
-rw-r--r--lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_default.h2
-rw-r--r--lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_large.h2
-rw-r--r--lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_medium.h2
-rw-r--r--lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_small.h2
-rw-r--r--secure_fw/partitions/crypto/CMakeLists.txt1
6 files changed, 6 insertions, 4 deletions
diff --git a/config/check_config.cmake b/config/check_config.cmake
index 97e283c4b5..ff11f44450 100644
--- a/config/check_config.cmake
+++ b/config/check_config.cmake
@@ -89,3 +89,4 @@ tfm_invalid_config(TFM_ENABLE_SLIH_TEST AND TFM_ENABLE_FLIH_TEST)
########################### TF-M crypto ########################################
tfm_invalid_config(PLATFORM_DUMMY_NV_SEED AND CRYPTO_HW_ACCELERATOR)
+tfm_invalid_config(NOT PLATFORM_DUMMY_NV_SEED AND NOT CRYPTO_HW_ACCELERATOR)
diff --git a/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_default.h b/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_default.h
index 9febb96649..12737b5d66 100644
--- a/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_default.h
+++ b/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_default.h
@@ -2013,7 +2013,7 @@
#ifdef CRYPTO_HW_ACCELERATOR
#include "mbedtls_accelerator_config.h"
-#else
+#elif defined(MBEDTLS_ENTROPY_NV_SEED)
#include "mbedtls_entropy_nv_seed_config.h"
#endif
diff --git a/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_large.h b/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_large.h
index d1e57bc0fe..f8bcd6b0b2 100644
--- a/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_large.h
+++ b/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_large.h
@@ -2008,7 +2008,7 @@
#ifdef CRYPTO_HW_ACCELERATOR
#include "mbedtls_accelerator_config.h"
-#else
+#elif defined(MBEDTLS_ENTROPY_NV_SEED)
#include "mbedtls_entropy_nv_seed_config.h"
#endif
diff --git a/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_medium.h b/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_medium.h
index 7472f600a8..eebd4b02c8 100644
--- a/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_medium.h
+++ b/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_medium.h
@@ -2008,7 +2008,7 @@
#ifdef CRYPTO_HW_ACCELERATOR
#include "mbedtls_accelerator_config.h"
-#else
+#elif defined(MBEDTLS_ENTROPY_NV_SEED)
#include "mbedtls_entropy_nv_seed_config.h"
#endif
diff --git a/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_small.h b/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_small.h
index d787c65337..68432b73d4 100644
--- a/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_small.h
+++ b/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_profile_small.h
@@ -2008,7 +2008,7 @@
#ifdef CRYPTO_HW_ACCELERATOR
#include "mbedtls_accelerator_config.h"
-#else
+#elif defined(MBEDTLS_ENTROPY_NV_SEED)
#include "mbedtls_entropy_nv_seed_config.h"
#endif
diff --git a/secure_fw/partitions/crypto/CMakeLists.txt b/secure_fw/partitions/crypto/CMakeLists.txt
index 9b7fe7bf27..8332d29393 100644
--- a/secure_fw/partitions/crypto/CMakeLists.txt
+++ b/secure_fw/partitions/crypto/CMakeLists.txt
@@ -142,6 +142,7 @@ target_compile_definitions(crypto_service_mbedcrypto_config
PSA_CRYPTO_SECURE
# Workaround for https://github.com/ARMmbed/mbedtls/issues/1077
$<$<OR:$<STREQUAL:${CMAKE_SYSTEM_ARCHITECTURE},armv8-m.base>,$<STREQUAL:${CMAKE_SYSTEM_ARCHITECTURE},armv6-m>>:MULADDC_CANNOT_USE_R7>
+ $<$<BOOL:${PLATFORM_DUMMY_NV_SEED}>:PLATFORM_DUMMY_NV_SEED>
)
cmake_policy(SET CMP0079 NEW)