jukkar · seov-nordic · Aug 13, 2025 · Sep 9, 2025 · Sep 9, 2025 · Sep 9, 2025
diff --git a/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf b/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf
@@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n
 ### mbedTLS has its own heap
 # CONFIG_HEAP_MEM_POOL_SIZE is not set
 
-### We never want Zephyr's copy of tinycrypt.  If tinycrypt is needed,
-### MCUboot has its own copy in tree.
-# CONFIG_TINYCRYPT is not set
-# CONFIG_TINYCRYPT_ECC_DSA is not set
-# CONFIG_TINYCRYPT_SHA256 is not set
-
 CONFIG_FLASH=y
 CONFIG_FPROTECT=y
 
 ### Various Zephyr boards enable features that we don't want.
 # CONFIG_BT is not set
-# CONFIG_BT_CTLR is not set
 # CONFIG_I2C is not set
 
 CONFIG_LOG=y

diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf
@@ -12,7 +12,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502
 CONFIG_BT_MAX_CONN=6
 
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_EXCEPTION_STACK_TRACE=y
 
 # Improve debugging experience by disabling reset on fatal error

diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf
@@ -5,7 +5,6 @@
 #
 
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_EXCEPTION_STACK_TRACE=y
 
 # Improve debugging experience by disabling reset on fatal error

diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns.conf
@@ -5,7 +5,6 @@
 #
 
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_EXCEPTION_STACK_TRACE=y
 
 # Improve debugging experience by disabling reset on fatal error

diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns_rtt.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns_rtt.conf
@@ -5,7 +5,6 @@
 #
 
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_EXCEPTION_STACK_TRACE=y
 
 # Improve debugging experience by disabling reset on fatal error

diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_rtt.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_rtt.conf
@@ -5,7 +5,6 @@
 #
 
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_EXCEPTION_STACK_TRACE=y
 
 # Improve debugging experience by disabling reset on fatal error

diff --git a/applications/machine_learning/sysbuild/ipc_radio/prj.conf b/applications/machine_learning/sysbuild/ipc_radio/prj.conf
@@ -16,7 +16,6 @@ CONFIG_BT_HCI_RAW=y
 CONFIG_BT_CTLR_ASSERT_HANDLER=y
 
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_EXCEPTION_STACK_TRACE=y
 
 CONFIG_IPC_RADIO_BT=y

diff --git a/applications/machine_learning/sysbuild/mcuboot/prj.conf b/applications/machine_learning/sysbuild/mcuboot/prj.conf
@@ -18,18 +18,11 @@ CONFIG_BOOT_BOOTSTRAP=n
 ### mbedTLS has its own heap
 # CONFIG_HEAP_MEM_POOL_SIZE is not set
 
-### We never want Zephyr's copy of tinycrypt.  If tinycrypt is needed,
-### MCUboot has its own copy in tree.
-# CONFIG_TINYCRYPT is not set
-# CONFIG_TINYCRYPT_ECC_DSA is not set
-# CONFIG_TINYCRYPT_SHA256 is not set
-
 CONFIG_FLASH=y
 CONFIG_FPROTECT=y
 
 ### Various Zephyr boards enable features that we don't want.
 # CONFIG_BT is not set
-# CONFIG_BT_CTLR is not set
 # CONFIG_I2C is not set
 
 CONFIG_LOG=y

diff --git a/applications/matter_bridge/sysbuild/ipc_radio/prj.conf b/applications/matter_bridge/sysbuild/ipc_radio/prj.conf
@@ -29,7 +29,6 @@ CONFIG_BT_CTLR_PHY_2M=n
 
 # Debug and assert configuration
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_RESET_ON_FATAL_ERROR=n
 CONFIG_REBOOT=n
 

diff --git a/applications/matter_weather_station/prj.conf b/applications/matter_weather_station/prj.conf
@@ -73,10 +73,11 @@ CONFIG_SHELL=y
 CONFIG_SHELL_LOG_BACKEND=y
 
 # Configure USB CDC ACM
-CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
-CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Matter Weather"
-CONFIG_USB_DEVICE_VID=0x1915
-CONFIG_USB_DEVICE_PID=0x530D
+CONFIG_USB_DEVICE_STACK_NEXT=y
+CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA"
+CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Thingy:53 Matter Weather"
+CONFIG_CDC_ACM_SERIAL_VID=0x1915
+CONFIG_CDC_ACM_SERIAL_PID=0x530D
 CONFIG_UART_LINE_CTRL=y
 CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51
 

diff --git a/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf b/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf
@@ -35,7 +35,6 @@ CONFIG_BT_CTLR_PHY_2M=n
 
 # Debug and assert configuration
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_RESET_ON_FATAL_ERROR=n
 CONFIG_REBOOT=n
 

diff --git a/applications/nrf5340_audio/prj.conf b/applications/nrf5340_audio/prj.conf
@@ -11,7 +11,6 @@ CONFIG_SAMPLE_RATE_CONVERTER_FILTER_SIMPLE=y
 
 # General
 CONFIG_DEBUG=y
-CONFIG_DEBUG_INFO=y
 CONFIG_ASSERT=y
 CONFIG_STACK_USAGE=y
 CONFIG_THREAD_RUNTIME_STATS=y

diff --git a/applications/nrf5340_audio/prj_fota.conf b/applications/nrf5340_audio/prj_fota.conf
@@ -12,7 +12,6 @@ CONFIG_SAMPLE_RATE_CONVERTER_FILTER_SIMPLE=y
 
 # General
 CONFIG_DEBUG=y
-CONFIG_DEBUG_INFO=y
 CONFIG_ASSERT=y
 CONFIG_STACK_USAGE=y
 CONFIG_THREAD_RUNTIME_STATS=y

diff --git a/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf b/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf
@@ -16,18 +16,11 @@ CONFIG_BOOT_BOOTSTRAP=n
 ### mbedTLS has its own heap
 # CONFIG_HEAP_MEM_POOL_SIZE is not set
 
-### We never want Zephyr's copy of tinycrypt.  If tinycrypt is needed,
-### MCUboot has its own copy in tree.
-# CONFIG_TINYCRYPT is not set
-# CONFIG_TINYCRYPT_ECC_DSA is not set
-# CONFIG_TINYCRYPT_SHA256 is not set
-
 CONFIG_FLASH=y
 CONFIG_FPROTECT=y
 
 ### Various Zephyr boards enable features that we don't want.
 # CONFIG_BT is not set
-# CONFIG_BT_CTLR is not set
 # CONFIG_I2C is not set
 
 CONFIG_LOG=y

diff --git a/applications/serial_lte_modem/src/slm_ctrl_pin.c b/applications/serial_lte_modem/src/slm_ctrl_pin.c
@@ -99,7 +99,7 @@ static int configure_power_pin_interrupt(gpio_callback_handler_t handler, gpio_f
 	 */
 	err = gpio_pin_interrupt_configure(gpio_dev, pin, GPIO_INT_DISABLE);
 	if (err) {
-		LOG_ERR("Failed to configure %s (0x%x) on power pin. (%d)",
+		LOG_ERR("Failed to configure %s (0x%lx) on power pin. (%d)",
 			"interrupt", GPIO_INT_DISABLE, err);
 	}
 

diff --git a/applications/serial_lte_modem/sysbuild/mcuboot/prj.conf b/applications/serial_lte_modem/sysbuild/mcuboot/prj.conf
@@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n
 ### mbedTLS has its own heap
 # CONFIG_HEAP_MEM_POOL_SIZE is not set
 
-### We never want Zephyr's copy of tinycrypt.  If tinycrypt is needed,
-### MCUboot has its own copy in tree.
-# CONFIG_TINYCRYPT is not set
-# CONFIG_TINYCRYPT_ECC_DSA is not set
-# CONFIG_TINYCRYPT_SHA256 is not set
-
 CONFIG_FLASH=y
 CONFIG_FPROTECT=y
 
 ### Various Zephyr boards enable features that we don't want.
 # CONFIG_BT is not set
-# CONFIG_BT_CTLR is not set
 # CONFIG_I2C is not set
 
 CONFIG_LOG=y

diff --git a/boards/nordic/nrf54lv10dk/Kconfig.defconfig b/boards/nordic/nrf54lv10dk/Kconfig.defconfig
@@ -5,7 +5,7 @@
 DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
 DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
 
-config BT_CTLR
+config HAS_BT_CTLR
 	default BT
 
 config SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE

diff --git a/boards/nordic/nrf7120pdk/Kconfig.defconfig b/boards/nordic/nrf7120pdk/Kconfig.defconfig
@@ -3,7 +3,7 @@
 
 if BOARD_NRF7120PDK_NRF7120_CPUAPP
 
-config BT_CTLR
+config HAS_BT_CTLR
 	default BT
 
 config ROM_START_OFFSET
@@ -14,7 +14,7 @@ endif # BOARD_NRF7120PDK_NRF7120_CPUAPP
 
 if BOARD_NRF7120PDK_NRF7120_CPUAPP_NS
 
-config BT_CTLR
+config HAS_BT_CTLR
 	default BT
 
 # By default, if we build for a Non-Secure version of the board,

diff --git a/boards/nordic/thingy91x/Kconfig.defconfig.nrf5340 b/boards/nordic/thingy91x/Kconfig.defconfig.nrf5340
@@ -48,9 +48,6 @@ endif # BUILD_WITH_TFM
 DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
 DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
 
-config NFCT_PINS_AS_GPIOS
-	default y
-
 if BOARD_THINGY91X_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE
 
 config FLASH_LOAD_SIZE

diff --git a/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dtsi b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dtsi
@@ -129,6 +129,10 @@
 	pinctrl-names = "default", "sleep";
 };
 
+&uicr {
+	nfct-pins-as-gpios;
+};
+
 /* Include default memory partition configuration file. */
 /* This is not the layout that's actually used! It's overridden by Partition Manager. */
 #include <vendor/nordic/nrf5340_cpuapp_partition.dtsi>

diff --git a/drivers/mspi/mspi_sqspi.c b/drivers/mspi/mspi_sqspi.c
@@ -21,9 +21,6 @@
 #include <hal/nrf_oscillators.h>
 #include <hal/nrf_spu.h>
 #endif
-#if defined(CONFIG_SOC_NRF54H20_GPD)
-#include <nrf/gpd.h>
-#endif
 #include <dmm.h>
 
 LOG_MODULE_REGISTER(mspi_sqspi, CONFIG_MSPI_LOG_LEVEL);
@@ -432,13 +429,6 @@ static int dev_pm_action_cb(const struct device *dev,
 			return rc;
 		}
 
-#if defined(CONFIG_SOC_NRF54H20_GPD)
-		rc = nrf_gpd_retain_pins_set(dev_config->pcfg, false);
-		if (rc < 0) {
-			LOG_ERR("Cannot clear RETAIN for pins (%d)", rc);
-			return rc;
-		}
-#endif
 		nrf_sqspi_activate(&dev_config->sqspi);
 #if defined(CONFIG_SOC_SERIES_NRF54LX)
 		nrf_memconf_ramblock_ret_enable_set(NRF_MEMCONF,
@@ -452,13 +442,6 @@ static int dev_pm_action_cb(const struct device *dev,
 
 	if (IS_ENABLED(CONFIG_PM_DEVICE) &&
 	    action == PM_DEVICE_ACTION_SUSPEND) {
-#if defined(CONFIG_SOC_NRF54H20_GPD)
-		rc = nrf_gpd_retain_pins_set(dev_config->pcfg, true);
-		if (rc < 0) {
-			LOG_ERR("Cannot set RETAIN for pins (%d)", rc);
-			return rc;
-		}
-#endif
 		rc = pinctrl_apply_state(dev_config->pcfg,
 					 PINCTRL_STATE_SLEEP);
 		if (rc < 0) {