tests: benchmarks: multicore: idle_gpio: sysbuild

Fix sysbuild configuration for idle_gpio benchmark test.

Signed-off-by: Piotr Krzyzanowski <piotr.krzyzanowski@nordicsemi.no>

Author: nordic-pikr

tests/benchmarks/multicore/idle_gpio/Kconfig.sysbuild

@@ -4,26 +4,8 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-config RUN_PPRCORE
-	bool "Run test on Peripheral Processor Core (PPR)"
-
-choice PPRCORE
-	default PPRCORE_REMOTE if RUN_PPRCORE
-
-config PPRCORE_REMOTE
-	bool "Remote image"
-
-endchoice
-
-config PPRCORE_IMAGE_NAME
-	default "remote" if PPRCORE_REMOTE
-
-config PPRCORE_IMAGE_PATH
-	default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_gpio/remote" if PPRCORE_REMOTE
-
 choice NETCORE
-	default NETCORE_REMOTE if PPRCORE_NONE
-	default NETCORE_REMOTE_SLEEP_FOREVER if !PPRCORE_NONE
+	default NETCORE_REMOTE
 
 config NETCORE_REMOTE
 	bool "Remote image"
@@ -41,4 +23,18 @@ config NETCORE_IMAGE_PATH
 	default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_gpio/remote" if NETCORE_REMOTE
 	default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever" if NETCORE_REMOTE_SLEEP_FOREVER
 
+choice PPRCORE
+	default PPRCORE_NONE
+
+config PPRCORE_REMOTE
+	bool "Remote image"
+
+endchoice
+
+config PPRCORE_IMAGE_NAME
+	default "remote" if PPRCORE_REMOTE
+
+config PPRCORE_IMAGE_PATH
+	default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_gpio/remote" if PPRCORE_REMOTE
+
 source "share/sysbuild/Kconfig"

tests/benchmarks/multicore/idle_gpio/enable_ppr.overlay

@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2026 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+if(SB_CONFIG_SOC_NRF54H20 AND NOT SB_CONFIG_NETCORE_NONE)
+  set_config_bool(idle_gpio CONFIG_SOC_NRF54H20_CPURAD_ENABLE y)
+endif()
+
+if(NOT SB_CONFIG_PPRCORE_NONE)
+  set(idle_gpio_SNIPPET nordic-ppr CACHE STRING "" FORCE)
+endif()

tests/benchmarks/multicore/idle_gpio/sysbuild.cmake

@@ -9,8 +9,6 @@ common:
     regex:
       - "Multicore idle_gpio test on"
       - "Multicore idle_gpio test iteration 0"
-  extra_args:
-    - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
 
 tests:
   benchmarks.multicore.idle_gpio.nrf54h20dk_cpuapp_cpurad.s2ram:
@@ -20,6 +18,7 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
       - FILE_SUFFIX=s2ram
+      - SB_CONFIG_NETCORE_REMOTE=y
     harness: pytest
     harness_config:
       fixture: ppk_power_measure
@@ -34,8 +33,8 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
       - FILE_SUFFIX=s2ram
-      - SB_CONFIG_RUN_PPRCORE=y
-      - EXTRA_DTC_OVERLAY_FILE="enable_ppr.overlay"
+      - SB_CONFIG_NETCORE_REMOTE_SLEEP_FOREVER=y
+      - SB_CONFIG_PPRCORE_REMOTE=y
     harness: pytest
     harness_config:
       fixture: ppk_power_measure
@@ -52,6 +51,7 @@ tests:
       - SB_CONFIG_BOOTLOADER_MCUBOOT=y
       - FILE_SUFFIX=s2ram
       - mcuboot_EXTRA_DTC_OVERLAY_FILE="${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_gpio/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay"
+      - SB_CONFIG_NETCORE_REMOTE=y
     harness: pytest
     harness_config:
       fixture: ppk_power_measure
@@ -68,6 +68,7 @@ tests:
       - FILE_SUFFIX=s2ram_merged_slot
       - SB_CONFIG_BOOTLOADER_MCUBOOT=y
       - SB_EXTRA_CONF_FILE="sysbuild/sysbuild_merged_slot.conf"
+      - SB_CONFIG_NETCORE_REMOTE=y
     harness: pytest
     harness_config:
       fixture: ppk_power_measure
@@ -83,6 +84,7 @@ tests:
     extra_args:
       - FILE_SUFFIX=s2ram
       - EXTRA_DTC_OVERLAY_FILE="wakeup_from_uart_pins.overlay"
+      - SB_CONFIG_NETCORE_REMOTE=y
       - remote_EXTRA_DTC_OVERLAY_FILE="wakeup_from_uart_pins.overlay"
     harness: pytest
     harness_config:
@@ -100,6 +102,7 @@ tests:
     extra_args:
       - FILE_SUFFIX=s2ram
       - EXTRA_DTC_OVERLAY_FILE="wakeup_from_uart_pins.overlay"
+      - SB_CONFIG_NETCORE_REMOTE=y
       - remote_EXTRA_DTC_OVERLAY_FILE="wakeup_from_uart_pins_gpiote0.overlay"
     harness: pytest
     harness_config:
@@ -117,6 +120,7 @@ tests:
     extra_args:
       - FILE_SUFFIX=s2ram
       - EXTRA_DTC_OVERLAY_FILE="wakeup_from_uart_pins.overlay"
+      - SB_CONFIG_NETCORE_REMOTE=y
       - remote_EXTRA_DTC_OVERLAY_FILE="wakeup_from_uart_pins_gpiote0.overlay"
       - remote_CONFIG_TEST_GPIOTE_LATENCY_LOWPOWER=y
     harness: pytest
@@ -134,8 +138,9 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
       - FILE_SUFFIX=s2ram
-      - SB_CONFIG_RUN_PPRCORE=y
-      - EXTRA_DTC_OVERLAY_FILE="enable_ppr.overlay;wakeup_from_uart_pins.overlay"
+      - EXTRA_DTC_OVERLAY_FILE="wakeup_from_uart_pins.overlay"
+      - SB_CONFIG_NETCORE_REMOTE_SLEEP_FOREVER=y
+      - SB_CONFIG_PPRCORE_REMOTE=y
       - remote_EXTRA_DTC_OVERLAY_FILE="wakeup_from_uart_pins.overlay"
     harness: pytest
     harness_config: