manifest: sdk-zephyr: unclean cherry pick of power domain refactor and swext support

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) {

samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot_merged_slot.overlay

@@ -11,3 +11,58 @@
 		zephyr,code-partition = &boot_partition;
 	};
 };
+
+/*
+ * Copy required overlay for mcuboot from bootloader/mcuboot.
+ *
+ * Required as the overlay in bootloader/mcuboot is ignored due to
+ * FILE_SUFFIX="merged_slot" matching this overlay instead.
+ */
+
+&gdpwr {
+	status = "disabled";
+};
+
+&gdpwr_fast_active_0 {
+	status = "disabled";
+};
+
+&gdpwr_fast_active_1 {
+	status = "disabled";
+};
+
+&gdpwr_fast_main {
+	status = "disabled";
+};
+
+&gdpwr_slow_active {
+	status = "disabled";
+};
+
+&gdpwr_slow_main {
+	status = "disabled";
+};
+
+&gpio_pad_group0 {
+	status = "disabled";
+};
+
+&gpio_pad_group1 {
+	status = "disabled";
+};
+
+&gpio_pad_group2 {
+	status = "disabled";
+};
+
+&gpio_pad_group6 {
+	status = "disabled";
+};
+
+&gpio_pad_group7 {
+	status = "disabled";
+};
+
+&gpio_pad_group9 {
+	status = "disabled";
+};

sysbuild/CMakeLists.txt

@@ -291,9 +291,9 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
 
     if(SB_CONFIG_SOC_SERIES_NRF54HX)
       if(SB_CONFIG_MCUBOOT_SIGNATURE_USING_ITS)
-        set_config_bool(mcuboot CONFIG_NRF_BOOT_SIGNATURE_USING_ITS y)
+        set_config_bool(mcuboot CONFIG_NCS_BOOT_SIGNATURE_USING_ITS y)
       else()
-        set_config_bool(mcuboot CONFIG_NRF_BOOT_SIGNATURE_USING_ITS n)
+        set_config_bool(mcuboot CONFIG_NCS_BOOT_SIGNATURE_USING_ITS n)
       endif()
     endif()
 

tests/benchmarks/multicore/idle/testcase.yaml

@@ -103,13 +103,17 @@ tests:
       - CONFIG_FIRST_SLEEP_OFFSET=y
       - CONFIG_PM=y
       - CONFIG_PM_S2RAM=y
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
       - CONFIG_POWEROFF=y
       - CONFIG_PM_S2RAM_CUSTOM_MARKING=y
       - CONFIG_CONSOLE=n
       - CONFIG_UART_CONSOLE=n
       - CONFIG_SERIAL=n
       - CONFIG_GPIO=n
       - CONFIG_BOOT_BANNER=n
+      - remote_CONFIG_PM_DEVICE=y
+      - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
       - remote_CONFIG_PM=y
       - remote_CONFIG_POWEROFF=y
       - remote_CONFIG_CONSOLE=n
@@ -135,6 +139,8 @@ tests:
       - CONFIG_FIRST_SLEEP_OFFSET=y
       - CONFIG_PM=y
       - CONFIG_PM_S2RAM=y
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
       - CONFIG_POWEROFF=y
       - CONFIG_PM_S2RAM_CUSTOM_MARKING=y
       - CONFIG_CONSOLE=n
@@ -143,6 +149,8 @@ tests:
       - CONFIG_GPIO=n
       - CONFIG_BOOT_BANNER=n
       - CONFIG_FPU=y
+      - remote_CONFIG_PM_DEVICE=y
+      - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
       - remote_CONFIG_PM=y
       - remote_CONFIG_POWEROFF=y
       - remote_CONFIG_CONSOLE=n
@@ -168,13 +176,17 @@ tests:
       - CONFIG_FIRST_SLEEP_OFFSET=y
       - CONFIG_PM=y
       - CONFIG_PM_S2RAM=y
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
       - CONFIG_POWEROFF=y
       - CONFIG_PM_S2RAM_CUSTOM_MARKING=y
       - CONFIG_CONSOLE=n
       - CONFIG_UART_CONSOLE=n
       - CONFIG_SERIAL=n
       - CONFIG_GPIO=n
       - CONFIG_BOOT_BANNER=n
+      - remote_CONFIG_PM_DEVICE=y
+      - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
       - remote_CONFIG_PM=y
       - remote_CONFIG_POWEROFF=y
       - remote_CONFIG_CONSOLE=n
@@ -201,13 +213,17 @@ tests:
       - CONFIG_FIRST_SLEEP_OFFSET=y
       - CONFIG_PM=y
       - CONFIG_PM_S2RAM=y
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
       - CONFIG_POWEROFF=y
       - CONFIG_PM_S2RAM_CUSTOM_MARKING=y
       - CONFIG_CONSOLE=n
       - CONFIG_UART_CONSOLE=n
       - CONFIG_SERIAL=n
       - CONFIG_GPIO=n
       - CONFIG_BOOT_BANNER=n
+      - remote_CONFIG_PM_DEVICE=y
+      - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
       - remote_CONFIG_PM=y
       - remote_CONFIG_POWEROFF=y
       - remote_CONFIG_CONSOLE=n
@@ -234,13 +250,17 @@ tests:
       - CONFIG_FIRST_SLEEP_OFFSET=y
       - CONFIG_PM=y
       - CONFIG_PM_S2RAM=y
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
       - CONFIG_POWEROFF=y
       - CONFIG_PM_S2RAM_CUSTOM_MARKING=y
       - CONFIG_CONSOLE=n
       - CONFIG_UART_CONSOLE=n
       - CONFIG_SERIAL=n
       - CONFIG_GPIO=n
       - CONFIG_BOOT_BANNER=n
+      - remote_CONFIG_PM_DEVICE=y
+      - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
       - remote_CONFIG_PM=y
       - remote_CONFIG_POWEROFF=y
       - remote_CONFIG_CONSOLE=n
@@ -266,13 +286,17 @@ tests:
       - CONFIG_FIRST_SLEEP_OFFSET=y
       - CONFIG_PM=y
       - CONFIG_PM_S2RAM=y
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
       - CONFIG_POWEROFF=y
       - CONFIG_PM_S2RAM_CUSTOM_MARKING=y
       - CONFIG_CONSOLE=n
       - CONFIG_UART_CONSOLE=n
       - CONFIG_SERIAL=n
       - CONFIG_GPIO=n
       - CONFIG_BOOT_BANNER=n
+      - remote_CONFIG_PM_DEVICE=y
+      - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
       - remote_CONFIG_PM=y
       - remote_CONFIG_POWEROFF=y
       - remote_CONFIG_CONSOLE=n
@@ -299,13 +323,17 @@ tests:
       - CONFIG_FIRST_SLEEP_OFFSET=y
       - CONFIG_PM=y
       - CONFIG_PM_S2RAM=y
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
       - CONFIG_POWEROFF=y
       - CONFIG_PM_S2RAM_CUSTOM_MARKING=y
       - CONFIG_CONSOLE=n
       - CONFIG_UART_CONSOLE=n
       - CONFIG_SERIAL=n
       - CONFIG_GPIO=n
       - CONFIG_BOOT_BANNER=n
+      - remote_CONFIG_PM_DEVICE=y
+      - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
       - remote_CONFIG_PM=y
       - remote_CONFIG_POWEROFF=y
       - remote_CONFIG_CONSOLE=n

tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.conf

@@ -8,3 +8,7 @@ CONFIG_SPI_NOR=n
 CONFIG_FPROTECT=n
 
 CONFIG_BOOT_WATCHDOG_FEED=n
+
+# Power domains forced on by default on boot, no need
+# to manage them in bootloader.
+CONFIG_POWER_DOMAIN=n

tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

@@ -11,3 +11,58 @@
 		zephyr,code-partition = &boot_partition;
 	};
 };
+
+/*
+ * Copy required overlay for mcuboot from bootloader/mcuboot.
+ *
+ * Required as the overlay in bootloader/mcuboot is ignored due to
+ * board overlay in this test.
+ */
+
+&gdpwr {
+	status = "disabled";
+};
+
+&gdpwr_fast_active_0 {
+	status = "disabled";
+};
+
+&gdpwr_fast_active_1 {
+	status = "disabled";
+};
+
+&gdpwr_fast_main {
+	status = "disabled";
+};
+
+&gdpwr_slow_active {
+	status = "disabled";
+};
+
+&gdpwr_slow_main {
+	status = "disabled";
+};
+
+&gpio_pad_group0 {
+	status = "disabled";
+};
+
+&gpio_pad_group1 {
+	status = "disabled";
+};
+
+&gpio_pad_group2 {
+	status = "disabled";
+};
+
+&gpio_pad_group6 {
+	status = "disabled";
+};
+
+&gpio_pad_group7 {
+	status = "disabled";
+};
+
+&gpio_pad_group9 {
+	status = "disabled";
+};

west.yml

@@ -65,7 +65,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 0351d6ecde6e92a5aa9be311a494b02c0e44eb53
+      revision: 9f27eaa5907ec1e27288596b51a66575eeddaa09
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -131,7 +131,7 @@ manifest:
           compare-by-default: true
     - name: mcuboot
       repo-path: sdk-mcuboot
-      revision: 05a633937029363ecb2208f9f855fe415f0038bc
+      revision: 79aa4378c23543ce93458f495432da73ef9f5dcb
       path: bootloader/mcuboot
     - name: qcbor
       url: https://github.com/laurencelundblade/QCBOR