Skip to content

Commit

Permalink
[nrf noup] crypto: Have CRYPTO_HW_ACCELERATOR support nrf_security
Browse files Browse the repository at this point in the history
Adjust CRYPTO_HW_ACCELERATOR build scripts to also support
nrf_security.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
(cherry picked from commit c136210)
(cherry picked from commit 3834117)
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
(cherry picked from commit 2bdad64)
Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Change-Id: Ied8e378ef55fe398ea4e45f65b3c270e9e9cd030
Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
(cherry picked from commit 5903966)
Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
  • Loading branch information
SebastianBoe committed Mar 1, 2024
1 parent 58d0b53 commit a3a03e5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
9 changes: 9 additions & 0 deletions platform/ext/accelerator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@

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()
Expand Down
2 changes: 1 addition & 1 deletion secure_fw/partitions/crypto/config_crypto_check.h
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit a3a03e5

Please sign in to comment.