scripts/quarantine.yaml

@@ -49,7 +49,16 @@
   comment: "To be fixed after upmerge. Footprint should be reduced. NCSDK-31428"
 
 - scenarios:
-    - applications.connectivity_bridge
+    - applications.nrf_desktop.zrelease
   platforms:
-    - thingy91x/nrf5340/cpuapp
-  comment: "https://nordicsemi.atlassian.net/browse/NCSDK-31534 - should be fixed after upmerge"
+    - nrf52833dk/nrf52820
+    - nrf52820dongle/nrf52820
+  comment: "https://nordicsemi.atlassian.net/browse/NCSDK-31675"
+
+- scenarios:
+    - applications.nrf_desktop.zdebug
+  platforms:
+    - nrf52833dk/nrf52820
+    - nrf52820dongle/nrf52820
+    - nrf52810dmouse/nrf52810
+  comment: "https://nordicsemi.atlassian.net/browse/NCSDK-31675"

scripts/quarantine_zephyr.yaml

@@ -238,6 +238,19 @@
     - nrf54h20dk@0.9.0/nrf54h20/cpuppr
   comment: "https://nordicsemi.atlassian.net/browse/NCSDK-31591"
 
+- scenarios:
+    - portability.posix.common.dynamic_stack
+  platforms:
+    - qemu_cortex_m3/ti_lm3s6965
+  comment: "https://nordicsemi.atlassian.net/browse/NCSDK-31667"
+
+- scenarios:
+    - sample.bluetooth.central.multilink
+    - sample.bluetooth.peripheral_identity
+  platforms:
+    - qemu_cortex_m3/ti_lm3s6965
+  comment: "https://nordicsemi.atlassian.net/browse/NCSDK-31671"
+
 # ---------------------------------   Won't fix section -----------------------------------
 
 - scenarios:

subsys/nrf_security/Kconfig

@@ -35,7 +35,7 @@ config NRF_SECURITY
 	depends on SOC_FAMILY_NORDIC_NRF
 	default y if BUILD_WITH_TFM
 	# entropy is provided by PSA and NRF_SECURITY on NRF54LX
-	default y if ENTROPY_PSA_CRYPTO_RNG && SOC_SERIES_NRF54LX
+	default y if DT_HAS_ZEPHYR_PSA_CRYPTO_RNG_ENABLED && SOC_SERIES_NRF54LX
 	select DISABLE_MBEDTLS_BUILTIN if MBEDTLS
 	# NCS does not use TF-M's BL2 bootloader, but uses it's own fork
 	# of MCUBoot instead (CONFIG_BOOTLOADER_MCUBOOT).

subsys/nrf_security/Kconfig.psa.nordic

@@ -400,18 +400,3 @@ config PSA_WANT_KEY_TYPE_SRP_PUBLIC_KEY
 	bool "SRP public key support" if !MBEDTLS_PROMPTLESS
 	help
 	  SRP public key support.
-
-config MBEDTLS_PSA_STATIC_KEY_SLOTS
-	bool "Statically allocated key slots"
-	default y if !(MBEDTLS_ENABLE_HEAP || BUILD_WITH_TFM)
-	help
-	  This configuration enables statically allocated key slots.
-	  This configuration is default enabled and is recommended to use to
-	  ensure the smallest possible build.
-
-config MBEDTLS_PSA_KEY_STORE_DYNAMIC
-	bool "Dynamically allocated key slots"
-	default y if !MBEDTLS_PSA_STATIC_KEY_SLOTS
-	help
-	  This configuration enables dynamically allocated key slots.
-	  This depends on heap being enabled in the system.

subsys/nrf_security/cmake/psa_crypto_config.cmake

@@ -451,8 +451,6 @@ kconfig_check_and_set_base_to_one(PSA_CRYPTO_DRIVER_ALG_PRNG_TEST)
 # PSA and Drivers
 kconfig_check_and_set_base_to_one(MBEDTLS_PSA_CRYPTO_STORAGE_C)
 kconfig_check_and_set_base_to_one(MBEDTLS_PSA_CRYPTO_DRIVERS)
-kconfig_check_and_set_base_to_one(MBEDTLS_PSA_STATIC_KEY_SLOTS)
-kconfig_check_and_set_base_to_one(MBEDTLS_PSA_KEY_STORE_DYNAMIC)
 kconfig_check_and_set_base_int(MBEDTLS_PSA_KEY_SLOT_COUNT)
 
 # Generate the PSA config file (default nrf-psa-crypto-config.h)

subsys/nrf_security/configs/psa_crypto_config.h.template

@@ -446,8 +446,6 @@
 #cmakedefine MBEDTLS_PSA_CRYPTO_DRIVERS                         @MBEDTLS_PSA_CRYPTO_DRIVERS@
 #cmakedefine MBEDTLS_PSA_CRYPTO_CLIENT
 #cmakedefine MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
-#cmakedefine MBEDTLS_PSA_STATIC_KEY_SLOTS
-#cmakedefine MBEDTLS_PSA_KEY_STORE_DYNAMIC
 #cmakedefine MBEDTLS_PSA_KEY_SLOT_COUNT                         @MBEDTLS_PSA_KEY_SLOT_COUNT@
 
 #include <psa/core_unsupported_ciphers_check.h>

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/2464/head
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -148,7 +148,7 @@ manifest:
     - name: nrfxlib
       repo-path: sdk-nrfxlib
       path: nrfxlib
-      revision: 1cdbd26200df91ae3500daf6f5e15fae686ffdf8
+      revision: pull/1648/head
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tf-m/trusted-firmware-m