Skip to content

Commit 5626a86

Browse files
jonathannilsenrlubos
authored andcommitted
[nrf fromtree] samples: drivers: mbox: switch nrf54h20 cpuapp and cpurad remotes
Switch which board is the remote in the test case for mbox communication between nrf54h20dk/nrf54h20/cpuapp and nrf54h20dk/nrf54h20/cpurad, making cpurad the remote instead. This is done to prepare the sample for executing with IronSide SE, where using cpurad as the main board doesn't make as much sense, since cpuapp has to start cpurad. Signed-off-by: Jonathan Nilsen <[email protected]> (cherry picked from commit d6673e1)
1 parent db86854 commit 5626a86

File tree

7 files changed

+9
-8
lines changed

7 files changed

+9
-8
lines changed

samples/drivers/mbox/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR
2424
CONFIG_BOARD_ESP32_DEVKITC_ESP32_PROCPU OR
2525
CONFIG_BOARD_ESP32S3_DEVKITM_ESP32S3_PROCPU OR
2626
CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR
27-
CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD OR
2827
CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUAPP OR
2928
CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUAPP OR
3029
CONFIG_BOARD_NRF54LM20DK_NRF54LM20A_CPUAPP OR

samples/drivers/mbox/Kconfig.sysbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ config REMOTE_BOARD
1818
default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69"
1919
default "frdm_mcxn947/mcxn947/cpu1" if $(BOARD) = "frdm_mcxn947"
2020
default "mcx_n9xx_evk/mcxn947/cpu1" if $(BOARD) = "mcx_n9xx_evk"
21-
default "nrf54h20dk/nrf54h20/cpuapp" if "$(BOARD)${BOARD_QUALIFIERS}" = "nrf54h20dk/nrf54h20/cpurad"
2221
default "nrf54l09pdk/nrf54l09/cpuflpr" if $(BOARD) = "nrf54l09pdk"
2322
default "nrf54l15dk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15dk"
2423
default "nrf54lm20dk/nrf54lm20a/cpuflpr" if $(BOARD) = "nrf54lm20dk"

samples/drivers/mbox/remote/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET OR
2323
CONFIG_BOARD_ESP32S3_DEVKITM_ESP32S3_APPCPU OR
2424
CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUPPR OR
2525
CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUFLPR OR
26-
CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR
26+
CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD OR
2727
CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUFLPR OR
2828
CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUFLPR OR
2929
CONFIG_BOARD_NRF54LM20DK_NRF54LM20A_CPUFLPR OR

samples/drivers/mbox/sample.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,21 @@ tests:
5959
- "Ping \\(on channel 16\\)"
6060
- "Pong \\(on channel 14\\)"
6161

62-
sample.drivers.mbox.nrf54h20_rad_app:
62+
sample.drivers.mbox.nrf54h20_app_rad:
6363
platform_allow:
64-
- nrf54h20dk/nrf54h20/cpurad
64+
- nrf54h20dk/nrf54h20/cpuapp
6565
integration_platforms:
66-
- nrf54h20dk/nrf54h20/cpurad
66+
- nrf54h20dk/nrf54h20/cpuapp
67+
extra_args:
68+
- SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
6769
sysbuild: true
6870
harness: console
6971
harness_config:
7072
type: multi_line
7173
ordered: false
7274
regex:
73-
- "Ping \\(on channel 18\\)"
74-
- "Pong \\(on channel 12\\)"
75+
- "Ping \\(on channel 12\\)"
76+
- "Pong \\(on channel 18\\)"
7577

7678
sample.drivers.mbox.nrf54l:
7779
platform_allow:
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad"

0 commit comments

Comments
 (0)