From 56ef933794974b04007c05725ea40ea89f3a614f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= Date: Fri, 24 Jan 2025 09:19:19 +0100 Subject: [PATCH] manifest: crypto: Add SYS_INIT of psa_crypto_init() in PRE_KERNEL_1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -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ø --- subsys/nrf_security/src/zephyr/CMakeLists.txt | 5 +++++ west.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/subsys/nrf_security/src/zephyr/CMakeLists.txt b/subsys/nrf_security/src/zephyr/CMakeLists.txt index 3bcc88738639..f73f6905eacc 100644 --- a/subsys/nrf_security/src/zephyr/CMakeLists.txt +++ b/subsys/nrf_security/src/zephyr/CMakeLists.txt @@ -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 diff --git a/west.yml b/west.yml index ddf986858d60..ddb46576ba01 100644 --- a/west.yml +++ b/west.yml @@ -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