Skip to content

Commit

Permalink
manifest: crypto: Add SYS_INIT of psa_crypto_init() in PRE_KERNEL_1
Browse files Browse the repository at this point in the history
-Adds sdk-zephyr PR #2447.
-Include manifest-update for adding usage of SYS_INIT to execute
 psa_crypto_init() in PRE_KERNEL_1 (before entropy_psa_crypto).
-Extended to work with nrf_security by adding the same file
 used by MBEDTLS_BUILTIN.

Note that zephyr_init.c is not used by nrf_security

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
  • Loading branch information
frkv committed Jan 29, 2025
1 parent 8ab4e82 commit 56ef933
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions subsys/nrf_security/src/zephyr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ if(CONFIG_MBEDTLS_ENABLE_HEAP)
)
endif()

# Add PSA crypto initialization in Zephyr
list(APPEND src_zephyr
${ZEPHYR_BASE}/modules/mbedtls/psa_init.c
)

if(CONFIG_MBEDTLS_ENTROPY_POLL)
list(APPEND src_zephyr
${NRF_SECURITY_ROOT}/src/zephyr/entropy_poll.c
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: pull/2411/head
revision: pull/2447/head
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down

0 comments on commit 56ef933

Please sign in to comment.