Skip to content

Commit 56ef933

Browse files
committed
manifest: crypto: Add SYS_INIT of psa_crypto_init() in PRE_KERNEL_1
-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]>
1 parent 8ab4e82 commit 56ef933

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Diff for: subsys/nrf_security/src/zephyr/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ if(CONFIG_MBEDTLS_ENABLE_HEAP)
2828
)
2929
endif()
3030

31+
# Add PSA crypto initialization in Zephyr
32+
list(APPEND src_zephyr
33+
${ZEPHYR_BASE}/modules/mbedtls/psa_init.c
34+
)
35+
3136
if(CONFIG_MBEDTLS_ENTROPY_POLL)
3237
list(APPEND src_zephyr
3338
${NRF_SECURITY_ROOT}/src/zephyr/entropy_poll.c

Diff for: west.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ manifest:
6969
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
7070
- name: zephyr
7171
repo-path: sdk-zephyr
72-
revision: pull/2411/head
72+
revision: pull/2447/head
7373
import:
7474
# In addition to the zephyr repository itself, NCS also
7575
# imports the contents of zephyr/west.yml at the above

0 commit comments

Comments
 (0)