nrfconnect · nordicjm · Oct 13, 2025 · Sep 4, 2025
@@ -6,6 +6,16 @@
 
 source "share/sysbuild/Kconfig"
 
-config REMOTE_BOARD
-	string
-	default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP
+choice NETCORE
+	default NETCORE_REMOTE_SLEEP_FOREVER
+
+config NETCORE_REMOTE_SLEEP_FOREVER
+	bool "Remote sleep forever image"
+
+endchoice
+
+config NETCORE_IMAGE_NAME
+	default "remote_sleep_forever" if NETCORE_REMOTE_SLEEP_FOREVER
+
+config NETCORE_IMAGE_PATH
+	default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever" if NETCORE_REMOTE_SLEEP_FOREVER
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	aliases {
+		/delete-property/ led1;
+	};
+};
+
+/delete-node/ &led1;
@@ -0,0 +1,4 @@
+CONFIG_LOG=n
+CONFIG_SERIAL=n
+
+CONFIG_SOC_EARLY_RESET_HOOK=y
@@ -6,6 +6,22 @@ common:
 
 tests:
   benchmarks.multicore.idle_adc.nrf54h20dk_cpuapp_cpurad.s2ram:
+    tags:
+      - ci_build
+      - ci_tests_benchmarks_multicore
+      - ppk_power_measure
+    filter: not CONFIG_COVERAGE
+    harness: pytest
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    harness_config:
+      fixture: gpio_loopback
+      pytest_root:
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_adc"
+
+  benchmarks.multicore.idle_adc.nrf54h20dk_cpuapp_cpurad.s2ram.mcuboot:
     tags:
       - ci_build
       - ci_tests_benchmarks_multicore
@@ -17,7 +33,8 @@ tests:
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
-      - FILE_SUFFIX=s2ram
+      - SB_CONFIG_BOOTLOADER_MCUBOOT=y
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_adc/boards/nrf54h20dk_mcuboot.overlay"
     harness_config:
       fixture: gpio_loopback
       pytest_root:

@@ -6,6 +6,16 @@
 
 source "share/sysbuild/Kconfig"
 
-config REMOTE_BOARD
-	string
-	default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP
+choice NETCORE
+	default NETCORE_REMOTE_SLEEP_FOREVER
+
+config NETCORE_REMOTE_SLEEP_FOREVER
+	bool "Remote sleep forever image"
+
+endchoice
+
+config NETCORE_IMAGE_NAME
+	default "remote_sleep_forever" if NETCORE_REMOTE_SLEEP_FOREVER
+
+config NETCORE_IMAGE_PATH
+	default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever" if NETCORE_REMOTE_SLEEP_FOREVER
@@ -0,0 +1,4 @@
+CONFIG_LOG=n
+CONFIG_SERIAL=n
+
+CONFIG_SOC_EARLY_RESET_HOOK=y
@@ -16,7 +16,26 @@ tests:
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
-      - FILE_SUFFIX=s2ram
+      - EXTRA_DTC_OVERLAY_FILE="boards/comp.overlay"
+    harness_config:
+      fixture: gpio_loopback
+      pytest_root:
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_comp"
+
+  benchmarks.multicore.idle_comp.nrf54h20dk_cpuapp_cpurad.s2ram.mcuboot:
+    tags:
+      - ci_build
+      - ci_tests_benchmarks_multicore
+      - ppk_power_measure
+    filter: not CONFIG_COVERAGE
+    harness: pytest
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    extra_args:
+      - SB_CONFIG_BOOTLOADER_MCUBOOT=y
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay"
       - EXTRA_DTC_OVERLAY_FILE="boards/comp.overlay"
     harness_config:
       fixture: gpio_loopback
@@ -35,7 +54,6 @@ tests:
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
-      - FILE_SUFFIX=s2ram
       - EXTRA_DTC_OVERLAY_FILE="boards/lpcomp.overlay"
     harness_config:
       fixture: gpio_loopback

@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+source "share/sysbuild/Kconfig"
+
+choice NETCORE
+	default NETCORE_REMOTE
+
+config NETCORE_REMOTE
+	bool "Remote image"
+
+endchoice
+
+config NETCORE_IMAGE_NAME
+	default "remote" if NETCORE_REMOTE
+
+config NETCORE_IMAGE_PATH
+	default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_counter/remote" if NETCORE_REMOTE
@@ -7,8 +7,6 @@ CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 
 CONFIG_PM=y
-CONFIG_PM_S2RAM=y
-CONFIG_PM_S2RAM_CUSTOM_MARKING=y
 CONFIG_POWEROFF=y
 CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n

@@ -0,0 +1,4 @@
+CONFIG_LOG=n
+CONFIG_SERIAL=n
+
+CONFIG_SOC_EARLY_RESET_HOOK=y
@@ -25,3 +25,13 @@ tests:
       fixture: ppk_power_measure
       pytest_root:
         - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_fast_counter_and_s2ram_with_clock_control"
+
+  benchmarks.power_consumption.counter.mcuboot:
+    extra_args:
+      - SB_CONFIG_BOOTLOADER_MCUBOOT=y
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_counter/boards/nrf54h20dk_nrf54h20_cpuapp.overlay"
+    harness: pytest
+    harness_config:
+      fixture: ppk_power_measure
+      pytest_root:
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_fast_counter_and_s2ram_with_clock_control"
@@ -6,6 +6,16 @@
 
 source "share/sysbuild/Kconfig"
 
-config REMOTE_BOARD
-	string
-	default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP
+choice NETCORE
+	default NETCORE_REMOTE_SLEEP_FOREVER
+
+config NETCORE_REMOTE_SLEEP_FOREVER
+	bool "Remote sleep forever image"
+
+endchoice
+
+config NETCORE_IMAGE_NAME
+	default "remote_sleep_forever" if NETCORE_REMOTE_SLEEP_FOREVER
+
+config NETCORE_IMAGE_PATH
+	default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever" if NETCORE_REMOTE_SLEEP_FOREVER
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	aliases {
+		/delete-property/ led1;
+	};
+};
+
+/delete-node/ &led1;
@@ -0,0 +1,4 @@
+CONFIG_LOG=n
+CONFIG_SERIAL=n
+
+CONFIG_SOC_EARLY_RESET_HOOK=y
@@ -23,6 +23,27 @@ tests:
         - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_exmif_and_s2ram"
     timeout: 90
 
+  benchmarks.multicore.idle_exmif.nrf54h20dk_cpuapp_cpurad.mcuboot:
+    tags:
+      - ci_build
+      - ci_tests_benchmarks_multicore
+      - exmif
+      - ppk_power_measure
+    filter: not CONFIG_COVERAGE
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    extra_args:
+      - SB_CONFIG_BOOTLOADER_MCUBOOT=y
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_exmif/boards/nrf54h20dk_mcuboot.overlay"
+    harness: pytest
+    harness_config:
+      fixture: ppk_power_measure
+      pytest_root:
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_exmif_and_s2ram"
+    timeout: 90
+
   benchmarks.multicore.idle_exmif.nrf54h20dk_cpuapp_cpurad.coverage:
     tags:
       - ci_build

@@ -6,5 +6,16 @@
 
 source "share/sysbuild/Kconfig"
 
-config REMOTE_BOARD
-	string "The board used for remote target"
+choice NETCORE
+	default NETCORE_REMOTE
+
+config NETCORE_REMOTE
+	bool "Remote image"
+
+endchoice
+
+config NETCORE_IMAGE_NAME
+	default "remote" if NETCORE_REMOTE
+
+config NETCORE_IMAGE_PATH
+	default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_gpio/remote" if NETCORE_REMOTE
@@ -0,0 +1,4 @@
+CONFIG_LOG=n
+CONFIG_SERIAL=n
+
+CONFIG_SOC_EARLY_RESET_HOOK=y