manifest: update sdk-nrf to latest main

eivindj-nordic · eivindj-nordic · commit 0c4a5ef6cc37 · 2026-05-19T13:59:00.000+02:00
Update sdk-nrf to e611a7a75c4380f05716c6f5a984b2e1ff9c589f.
Replace CONFIG_NRF_SECUROTY with CONFIG_PSA_CRYPTO.

Signed-off-by: Eivind Jølsgard &lt;eivind.jolsgard@nordicsemi.no&gt;
diff --git a/.github/workflows/build_samples.yml b/.github/workflows/build_samples.yml
@@ -16,7 +16,7 @@ jobs:
       - runs-on=${{ github.run_id }}
       - runner=64cpu-linux-x64
     # Keep aligned with target NCS version
-    container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v3.2.0
+    container: ghcr.io/nrfconnect/sdk-nrf-toolchain:f0aa129f09
     defaults:
       run:
         # Bash shell is needed to set toolchain related environment variables in docker container
diff --git a/.github/workflows/twister.yml b/.github/workflows/twister.yml
@@ -13,7 +13,7 @@ jobs:
       - runs-on=${{ github.run_id }}
       - runner=64cpu-linux-x64
     # Keep aligned with target NCS version
-    container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v3.3.0
+    container: ghcr.io/nrfconnect/sdk-nrf-toolchain:f0aa129f09
     defaults:
       run:
         # Bash shell is needed to set toolchain related environment variables in docker container
diff --git a/applications/firmware_loader/ble_mcumgr/prj.conf b/applications/firmware_loader/ble_mcumgr/prj.conf
@@ -39,7 +39,7 @@ CONFIG_MCUMGR_GRP_OS_ECHO=y
 CONFIG_MCUMGR_GRP_OS_MCUMGR_PARAMS=y
 CONFIG_MCUMGR_GRP_OS_BOOTLOADER_INFO=y
 CONFIG_NRF_SDH_BLE=y
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 CONFIG_BLE_MCUMGR=y
diff --git a/doc/nrf-bm/libraries/bluetooth/peer_manager.rst b/doc/nrf-bm/libraries/bluetooth/peer_manager.rst
@@ -453,7 +453,7 @@ LE Secure Connections is an optional functionality of the Peer Manager and is di
 However, if you want to use it, keep in mind that it depends on nRF Security to generate the Diffie-Helman key pair.
 The following Kconfig options must be enabled to support LE Secure Connections:
 
-* :kconfig:option:`CONFIG_NRF_SECURITY`
+* :kconfig:option:`CONFIG_PSA_CRYPTO`
 * :kconfig:option:`CONFIG_PSA_WANT_ALG_ECDH`
 * :kconfig:option:`CONFIG_PSA_WANT_GENERATE_RANDOM`
 * :kconfig:option:`CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE`
diff --git a/samples/bluetooth/ble_bms/prj.conf b/samples/bluetooth/ble_bms/prj.conf
@@ -6,7 +6,7 @@ CONFIG_LOG_BACKEND_BM_UARTE=y
 CONFIG_SOFTDEVICE=y
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/samples/bluetooth/ble_cgms/prj.conf b/samples/bluetooth/ble_cgms/prj.conf
@@ -6,7 +6,7 @@ CONFIG_LOG_BACKEND_BM_UARTE=y
 CONFIG_SOFTDEVICE=y
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/samples/bluetooth/ble_hids_keyboard/prj.conf b/samples/bluetooth/ble_hids_keyboard/prj.conf
@@ -6,7 +6,7 @@ CONFIG_LOG_BACKEND_BM_UARTE=y
 CONFIG_SOFTDEVICE=y
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/samples/bluetooth/ble_hids_mouse/prj.conf b/samples/bluetooth/ble_hids_mouse/prj.conf
@@ -6,7 +6,7 @@ CONFIG_LOG_BACKEND_BM_UARTE=y
 CONFIG_SOFTDEVICE=y
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/samples/bluetooth/ble_hrs/prj.conf b/samples/bluetooth/ble_hrs/prj.conf
@@ -6,7 +6,7 @@ CONFIG_LOG_BACKEND_BM_UARTE=y
 CONFIG_SOFTDEVICE=y
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/samples/bluetooth/ble_hrs_central/prj.conf b/samples/bluetooth/ble_hrs_central/prj.conf
@@ -10,7 +10,7 @@ CONFIG_NRF_SDH_BLE_TOTAL_LINK_COUNT=2
 CONFIG_NRF_SDH_BLE_CENTRAL_LINK_COUNT=1
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/samples/bluetooth/ble_lbs/prj.conf b/samples/bluetooth/ble_lbs/prj.conf
@@ -9,7 +9,7 @@ CONFIG_SOFTDEVICE=y
 CONFIG_NRF_SDH_BLE_VS_UUID_COUNT=1
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/samples/bluetooth/ble_nus/prj.conf b/samples/bluetooth/ble_nus/prj.conf
@@ -9,7 +9,7 @@ CONFIG_SOFTDEVICE=y
 CONFIG_NRF_SDH_BLE_VS_UUID_COUNT=1
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/samples/bluetooth/ble_nus_central/prj.conf b/samples/bluetooth/ble_nus_central/prj.conf
@@ -10,7 +10,7 @@ CONFIG_BM_GPIOTE=y
 CONFIG_BM_TIMER=y
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/samples/bluetooth/ble_pwr_profiling/prj.conf b/samples/bluetooth/ble_pwr_profiling/prj.conf
@@ -9,7 +9,7 @@ CONFIG_SOFTDEVICE=y
 CONFIG_NRF_SDH_BLE_VS_UUID_COUNT=1
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/samples/bluetooth/ble_radio_notification/prj.conf b/samples/bluetooth/ble_radio_notification/prj.conf
@@ -6,7 +6,7 @@ CONFIG_LOG_BACKEND_BM_UARTE=y
 CONFIG_SOFTDEVICE=y
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/samples/bluetooth/hello_softdevice/prj.conf b/samples/bluetooth/hello_softdevice/prj.conf
@@ -6,6 +6,6 @@ CONFIG_LOG_BACKEND_BM_UARTE=y
 CONFIG_SOFTDEVICE=y
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
diff --git a/samples/bluetooth/peripheral_nfc_pairing/prj.conf b/samples/bluetooth/peripheral_nfc_pairing/prj.conf
@@ -6,7 +6,7 @@ CONFIG_SOFTDEVICE=y
 CONFIG_NRF_SDH_BLE=y
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/samples/boot/mcuboot_recovery_entry/prj.conf b/samples/boot/mcuboot_recovery_entry/prj.conf
@@ -16,7 +16,7 @@ CONFIG_NRF_SDH_BLE_GAP_EVENT_LENGTH=10
 CONFIG_NRF_SDH_BLE_GATT_MAX_MTU_SIZE=498
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/samples/subsys/fs/bm_zms/prj.conf b/samples/subsys/fs/bm_zms/prj.conf
@@ -7,7 +7,7 @@ CONFIG_LOG_BUFFER_SIZE=2048
 CONFIG_SOFTDEVICE=y
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/samples/subsys/storage/bm_storage/prj.conf b/samples/subsys/storage/bm_storage/prj.conf
@@ -6,7 +6,7 @@ CONFIG_LOG_BACKEND_BM_UARTE=y
 CONFIG_SOFTDEVICE=y
 
 # Enable RNG
-CONFIG_NRF_SECURITY=y
+CONFIG_PSA_CRYPTO=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt
@@ -66,9 +66,9 @@ function(bm_install_setup)
 
       if(SB_CONFIG_SOC_SERIES_NRF54L)
         if(SB_CONFIG_BM_BOOTLOADER_MCUBOOT_SIGNATURE_TYPE_NONE)
-          set_config_bool(mcuboot CONFIG_NRF_SECURITY y)
+          set_config_bool(mcuboot CONFIG_PSA_CRYPTO y)
         elseif(SB_CONFIG_BM_BOOTLOADER_MCUBOOT_SIGNATURE_TYPE_ED25519)
-          set_config_bool(mcuboot CONFIG_NRF_SECURITY y)
+          set_config_bool(mcuboot CONFIG_PSA_CRYPTO y)
 
           # We are sure that ED25519 signature on MCUboot does not need these
           set_config_bool(mcuboot CONFIG_PSA_USE_CRACEN_AEAD_DRIVER n)
diff --git a/west.yml b/west.yml
@@ -14,7 +14,7 @@ manifest:
   projects:
     - name: nrf
       repo-path: sdk-nrf
-      revision: v3.3.0
+      revision: e611a7a75c4380f05716c6f5a984b2e1ff9c589f
       import:
         name-allowlist:
           - cmsis
