tests: benchmarks: Test power consumption for Mcuboot in dicrect xip mode

Extend Mcuboot PM testing for Direct Xip mode

Signed-off-by: Bartosz Miller <[email protected]>

Author: nordic-bami

tests/benchmarks/multicore/idle_gpio/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram_merged_slot.overlay

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay"
+#include "../sysbuild/nrf54h20dk_nrf54h20_memory_map_merged_slot.dtsi"
+
+secondary_app_partition: &cpuapp_slot1_partition {};

tests/benchmarks/multicore/idle_gpio/prj_s2ram_merged_slot.conf

@@ -0,0 +1,8 @@
+CONFIG_PM=y
+CONFIG_POWEROFF=y
+CONFIG_CONSOLE=n
+CONFIG_UART_CONSOLE=n
+CONFIG_SERIAL=n
+CONFIG_GPIO=y
+CONFIG_BOOT_BANNER=n
+CONFIG_NCS_BOOT_BANNER=n

tests/benchmarks/multicore/idle_gpio/remote/boards/nrf54h20dk_nrf54h20_cpurad_s2ram_merged_slot.overlay

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "nrf54h20dk_nrf54h20_cpurad_s2ram.overlay"
+#include "../../sysbuild/nrf54h20dk_nrf54h20_memory_map_merged_slot.dtsi"
+
+secondary_app_partition: &cpurad_slot1_partition {};

tests/benchmarks/multicore/idle_gpio/remote/prj_s2ram_merged_slot.conf

@@ -0,0 +1,8 @@
+CONFIG_PM=y
+CONFIG_POWEROFF=y
+CONFIG_CONSOLE=n
+CONFIG_UART_CONSOLE=n
+CONFIG_SERIAL=n
+CONFIG_GPIO=y
+CONFIG_BOOT_BANNER=n
+CONFIG_NCS_BOOT_BANNER=n

tests/benchmarks/multicore/idle_gpio/sysbuild/mcuboot_s2ram_merged_slot.conf

@@ -0,0 +1,4 @@
+CONFIG_LOG=n
+CONFIG_SERIAL=n
+
+CONFIG_SOC_EARLY_RESET_HOOK=y

tests/benchmarks/multicore/idle_gpio/sysbuild/mcuboot_s2ram_merged_slot.overlay

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "../boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay"
+#include "nrf54h20dk_nrf54h20_memory_map_merged_slot.dtsi"
+
+/ {
+	chosen {
+		zephyr,code-partition = &boot_partition;
+	};
+};

tests/benchmarks/multicore/idle_gpio/sysbuild/nrf54h20dk_nrf54h20_memory_map_merged_slot.dtsi

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/* On nRF54H20 the Direct XIP mode is supported in the merged slot configuration
+ * Extend slot0_partition and slot1_partition to cover both application and
+ * radio images, as well as MCUboot image metadata (header and trailer).
+ * Those partitions will be used by MCUboot to verify the merged image to boot.
+ * Apart from that, they will be used by the MCUmgr subsystem to correctly
+ * handle flags, stored inside the MCUboot image trailer.
+ * Use cpu<app|rad>_slot<0|1>_partition as zephyr,code-partition, so the
+ * application and radio sizes are correctly reported.
+ */
+/delete-node/&cpuapp_slot0_partition;
+/delete-node/&cpuapp_slot1_partition;
+/delete-node/&cpurad_slot0_partition;
+/delete-node/&cpurad_slot1_partition;
+
+&mram1x {
+	partitions {
+		/* Merged partition used by the MCUboot (variant 0). */
+		slot0_partition: partition@40000 {
+			reg = <0x40000 DT_SIZE_K(656)>;
+		};
+
+		/* Application code partition (variant 0).
+		 * Offset by the MCUboot header size (2048 bytes).
+		 */
+		cpuapp_slot0_partition: partition@40800 {
+			reg = <0x40800 DT_SIZE_K(326)>;
+		};
+
+		/* Radio code partition (variant 0). */
+		cpurad_slot0_partition: partition@92000 {
+			reg = <0x92000 DT_SIZE_K(328)>;
+		};
+
+		/* Merged partition used by the MCUboot (variant 1). */
+		slot1_partition: partition@100000 {
+			reg = <0x100000 DT_SIZE_K(656)>;
+		};
+
+		/* Application code partition (variant 1).
+		 * Offset by the MCUboot header size (2048 bytes).
+		 */
+		cpuapp_slot1_partition: partition@100800 {
+			reg = <0x100800 DT_SIZE_K(326)>;
+		};
+
+		/* Radio code partition (variant 1). */
+		cpurad_slot1_partition: partition@152000 {
+			reg = <0x152000 DT_SIZE_K(328)>;
+		};
+	};
+};

tests/benchmarks/multicore/idle_gpio/sysbuild/sysbuild_merged_slot.conf

@@ -0,0 +1,2 @@
+SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP_WITH_REVERT=y
+SB_CONFIG_MCUBOOT_IMAGES_ROM_END_OFFSET_AUTO="remote;remote_secondary_app"

tests/benchmarks/multicore/idle_gpio/testcase.yaml

@@ -59,6 +59,22 @@ tests:
         - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_simple"
     tags: ppk_power_measure
 
+  benchmarks.multicore.idle_gpio.nrf54h20dk_cpuapp_cpurad.s2ram.mcuboot.direct_xip:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    extra_args:
+      - FILE_SUFFIX=s2ram_merged_slot
+      - SB_CONFIG_BOOTLOADER_MCUBOOT=y
+      - SB_EXTRA_CONF_FILE="sysbuild/sysbuild_merged_slot.conf"
+    harness: pytest
+    harness_config:
+      fixture: ppk_power_measure
+      pytest_root:
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_simple"
+    tags: ppk_power_measure
+
   benchmarks.multicore.idle_gpio.nrf54h20dk_cpuapp_cpurad.s2ram.wakeup_from_uart_pins:
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp