Revert "[nrf fromlist] samples: drivers: mbox: switch nrf54h20 cpuapp and cpurad remotes"

This reverts commit 90eebd5.

Signed-off-by: Jonathan Nilsen <[email protected]>

Author: jonathannilsen

samples/drivers/mbox/CMakeLists.txt

@@ -24,6 +24,7 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR
    CONFIG_BOARD_ESP32_DEVKITC_ESP32_PROCPU OR
    CONFIG_BOARD_ESP32S3_DEVKITM_ESP32S3_PROCPU OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR
+   CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD OR
    CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUAPP OR
    CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUAPP OR
    CONFIG_BOARD_NRF54LM20DK_NRF54LM20A_CPUAPP OR

samples/drivers/mbox/Kconfig.sysbuild

@@ -18,6 +18,7 @@ config REMOTE_BOARD
 	default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69"
 	default "frdm_mcxn947/mcxn947/cpu1" if $(BOARD) = "frdm_mcxn947"
 	default "mcx_n9xx_evk/mcxn947/cpu1" if $(BOARD) = "mcx_n9xx_evk"
+	default "nrf54h20dk/nrf54h20/cpuapp" if "$(BOARD)${BOARD_QUALIFIERS}" = "nrf54h20dk/nrf54h20/cpurad"
 	default "nrf54l09pdk/nrf54l09/cpuflpr" if $(BOARD) = "nrf54l09pdk"
 	default "nrf54l15dk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15dk"
 	default "nrf54lm20dk/nrf54lm20a/cpuflpr" if $(BOARD) = "nrf54lm20dk"

samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay renamed to samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpurad.overlay

@@ -23,7 +23,7 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET OR
    CONFIG_BOARD_ESP32S3_DEVKITM_ESP32S3_APPCPU OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUPPR OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUFLPR OR
-   CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD OR
+   CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR
    CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUFLPR OR
    CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUFLPR OR
    CONFIG_BOARD_NRF54LM20DK_NRF54LM20A_CPUFLPR OR

samples/drivers/mbox/remote/CMakeLists.txt

@@ -59,21 +59,19 @@ tests:
         - "Ping \\(on channel 16\\)"
         - "Pong \\(on channel 14\\)"
 
-  sample.drivers.mbox.nrf54h20_app_rad:
+  sample.drivers.mbox.nrf54h20_rad_app:
     platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
     integration_platforms:
-      - nrf54h20dk/nrf54h20/cpuapp
-    extra_args:
-      - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
+      - nrf54h20dk/nrf54h20/cpurad
     sysbuild: true
     harness: console
     harness_config:
       type: multi_line
       ordered: false
       regex:
-        - "Ping \\(on channel 12\\)"
-        - "Pong \\(on channel 18\\)"
+        - "Ping \\(on channel 18\\)"
+        - "Pong \\(on channel 12\\)"
 
   sample.drivers.mbox.nrf54l:
     platform_allow: