tests: benchmarks: multicore: idle_pwm_*: Rework SB_CONFIG_REMOTE_BOARD

Define default REMOTE_BOARD based on build target.

Signed-off-by: Sebastian Głąb <[email protected]>

Author: nordic-segl

tests/benchmarks/multicore/idle_pwm_led/Kconfig.sysbuild

@@ -7,4 +7,5 @@
 source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
 
 config REMOTE_BOARD
-	string "The board used for remote target"
+	string
+	default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP

tests/benchmarks/multicore/idle_pwm_led/sysbuild.cmake

@@ -14,9 +14,4 @@ ExternalZephyrProject_Add(
     SOURCE_DIR ${APP_DIR}/remote
     BOARD ${SB_CONFIG_REMOTE_BOARD}
     BOARD_REVISION ${BOARD_REVISION}
-  )
-
-# Add a dependency so that the remote image will be built and flashed first
-add_dependencies(idle_pwm_led remote)
-# Add dependency so that the remote image is flashed first.
-sysbuild_add_dependencies(FLASH idle_pwm_led remote)
+)

tests/benchmarks/multicore/idle_pwm_led/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf

@@ -8,8 +8,6 @@ common:
 
 tests:
   benchmarks.multicore.idle_pwm_led.nrf54h20dk_cpuapp_cpurad.no_sleep:
-    extra_args:
-      SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
     harness: console
     harness_config:
       type: multi_line
@@ -22,7 +20,6 @@ tests:
   benchmarks.multicore.idle_pwm_led.nrf54h20dk_cpuapp_cpurad.idle:
     tags: ppk_power_measure
     extra_args:
-      SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
       idle_pwm_led_CONF_FILE=prj_s2ram.conf
       remote_CONF_FILE=prj_s2ram.conf
       idle_pwm_led_CONFIG_TEST_SLEEP_DURATION_MS=500
@@ -36,7 +33,6 @@ tests:
   benchmarks.multicore.idle_pwm_led.nrf54h20dk_cpuapp_cpurad.s2ram:
     tags: ppk_power_measure
     extra_args:
-      SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
       idle_pwm_led_CONF_FILE=prj_s2ram.conf
       remote_CONF_FILE=prj_s2ram.conf
     harness: pytest
@@ -48,7 +44,6 @@ tests:
   benchmarks.multicore.idle_pwm_led.nrf54h20dk_cpuapp_cpurad.idle_fast:
     tags: ppk_power_measure
     extra_args:
-      SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
       idle_pwm_led_CONF_FILE=prj_s2ram.conf
       remote_CONF_FILE=prj_s2ram.conf
       idle_pwm_led_CONFIG_TEST_SLEEP_DURATION_MS=500
@@ -63,7 +58,6 @@ tests:
   benchmarks.multicore.idle_pwm_led.nrf54h20dk_cpuapp_cpurad.s2ram_fast:
     tags: ppk_power_measure
     extra_args:
-      SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
       idle_pwm_led_CONF_FILE=prj_s2ram.conf
       remote_CONF_FILE=prj_s2ram.conf
       idle_pwm_led_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_0.overlay"

tests/benchmarks/multicore/idle_pwm_led/testcase.yaml

@@ -7,4 +7,5 @@
 source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
 
 config REMOTE_BOARD
-	string "The board used for remote target"
+	string
+	default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP

tests/benchmarks/multicore/idle_pwm_loopback/Kconfig.sysbuild

@@ -14,4 +14,4 @@ ExternalZephyrProject_Add(
     SOURCE_DIR ${APP_DIR}/remote
     BOARD ${SB_CONFIG_REMOTE_BOARD}
     BOARD_REVISION ${BOARD_REVISION}
-  )
+)

tests/benchmarks/multicore/idle_pwm_loopback/sysbuild.cmake

@@ -8,8 +8,6 @@ common:
 
 tests:
   benchmarks.multicore.idle_pwm_loopback.nrf54h20dk_cpuapp_cpurad.no_sleep:
-    extra_args:
-      SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
     harness: console
     harness_config:
       fixture: spi_loopback
@@ -23,7 +21,6 @@ tests:
   benchmarks.multicore.idle_pwm_loopback.nrf54h20dk_cpuapp_cpurad.idle:
     tags: ppk_power_measure
     extra_args:
-      SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
       idle_pwm_loopback_CONF_FILE=prj_s2ram.conf
       remote_CONF_FILE=prj_s2ram.conf
       idle_pwm_loopback_CONFIG_TEST_SLEEP_DURATION_MS=500
@@ -37,7 +34,6 @@ tests:
   benchmarks.multicore.idle_pwm_loopback.nrf54h20dk_cpuapp_cpurad.s2ram:
     tags: ppk_power_measure
     extra_args:
-      SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
       idle_pwm_loopback_CONF_FILE=prj_s2ram.conf
       remote_CONF_FILE=prj_s2ram.conf
     harness: pytest
@@ -48,7 +44,6 @@ tests:
 
   benchmarks.multicore.idle_pwm_loopback.nrf54h20dk_cpuapp_cpurad.no_sleep_fast:
     extra_args:
-      SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
       idle_pwm_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_1.overlay"
     harness: console
     harness_config:
@@ -62,7 +57,6 @@ tests:
   benchmarks.multicore.idle_pwm_loopback.nrf54h20dk_cpuapp_cpurad.idle_fast:
     tags: ppk_power_measure
     extra_args:
-      SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
       idle_pwm_loopback_CONF_FILE=prj_s2ram.conf
       remote_CONF_FILE=prj_s2ram.conf
       idle_pwm_loopback_CONFIG_TEST_SLEEP_DURATION_MS=500
@@ -77,7 +71,6 @@ tests:
   benchmarks.multicore.idle_pwm_loopback.nrf54h20dk_cpuapp_cpurad.s2ram_fast:
     tags: ppk_power_measure
     extra_args:
-      SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
       idle_pwm_loopback_CONF_FILE=prj_s2ram.conf
       remote_CONF_FILE=prj_s2ram.conf
       idle_pwm_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_1.overlay"