[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 c136210) (cherry picked from commit 3834117) Signed-off-by: Joakim Andersson <[email protected]> (cherry picked from commit 2bdad64) Signed-off-by: Markus Swarowsky <[email protected]> Change-Id: Ied8e378ef55fe398ea4e45f65b3c270e9e9cd030 Signed-off-by: Markus Swarowsky <[email protected]> (cherry picked from commit 5903966) Signed-off-by: Markus Swarowsky <[email protected]> (cherry picked from commit a3a03e5) Signed-off-by: Frank Audun Kvamtrø <[email protected]>
nrfconnect · Dec 23, 2024 · 3f08f25 · 3f08f25
1 parent 279e61b
commit 3f08f25
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/platform/ext/accelerator/CMakeLists.txt b/platform/ext/accelerator/CMakeLists.txt
@@ -5,6 +5,17 @@
 #
 #-------------------------------------------------------------------------------
 
+cmake_policy(SET CMP0079 NEW)
+
+# TODO: Verify that this works for both minimal and normal configuration
+target_compile_definitions(tfm_config
+    INTERFACE
+        CRYPTO_HW_ACCELERATOR
+)
+
+# When using nrf_security we don't need these build scripts
+return()
+
 if(BL2)
     add_library(bl2_crypto_hw STATIC)
 endif()

diff --git a/secure_fw/partitions/crypto/config_crypto_check.h b/secure_fw/partitions/crypto/config_crypto_check.h
@@ -12,7 +12,7 @@
 
 /* Check invalid configs. */
 #if CRYPTO_NV_SEED && defined(CRYPTO_HW_ACCELERATOR)
-#error "Invalid config: CRYPTO_NV_SEED AND CRYPTO_HW_ACCELERATOR!"
+// #error "Invalid config: CRYPTO_NV_SEED AND CRYPTO_HW_ACCELERATOR!"
 #endif
 
 #if (!CRYPTO_NV_SEED) && (!defined(CRYPTO_HW_ACCELERATOR))