[nrf noup] crypto: Have CRYPTO_HW_ACCELERATOR support nrf_security

Adjust CRYPTO_HW_ACCELERATOR build scripts to also support nrf_security. Signed-off-by: Sebastian Bøe <[email protected]> Signed-off-by: Joakim Andersson <[email protected]> (cherry picked from commit 8c190c9)
mswarowsky · Feb 20, 2023 · 3834117 · 3834117
1 parent c93707c
commit 3834117
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/config/check_config.cmake b/config/check_config.cmake
@@ -98,7 +98,9 @@ tfm_invalid_config(TFM_PARTITION_AUDIT_LOG AND NOT TFM_LIB_MODEL)
 
 ########################### TF-M crypto ########################################
 
-tfm_invalid_config(CRYPTO_NV_SEED AND CRYPTO_HW_ACCELERATOR)
+# The nrf_security CRYPTO_HW_ACCELERATOR does not provide a crypto non-volatile seed
+#
+#tfm_invalid_config(CRYPTO_NV_SEED AND CRYPTO_HW_ACCELERATOR)
 tfm_invalid_config(NOT CRYPTO_NV_SEED AND NOT CRYPTO_HW_ACCELERATOR)
 
 ######################## TF-M Porfile config check #############################

diff --git a/platform/ext/accelerator/CMakeLists.txt b/platform/ext/accelerator/CMakeLists.txt
@@ -7,6 +7,9 @@
 
 cmake_policy(SET CMP0079 NEW)
 
+# When using nrf_security we don't need these build scripts
+return()
+
 if(BL1 AND PLATFORM_DEFAULT_BL1)
     add_library(bl1_crypto_hw STATIC)
 endif()