diff --git a/samples/drivers/mbox/CMakeLists.txt b/samples/drivers/mbox/CMakeLists.txt index e4fbfb89dee..658a18ac21f 100644 --- a/samples/drivers/mbox/CMakeLists.txt +++ b/samples/drivers/mbox/CMakeLists.txt @@ -18,6 +18,7 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0 OR CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR + CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD OR CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP OR CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M7) message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as Main in this sample") diff --git a/samples/drivers/mbox/Kconfig.sysbuild b/samples/drivers/mbox/Kconfig.sysbuild index 080bea5b665..077fb85db64 100644 --- a/samples/drivers/mbox/Kconfig.sysbuild +++ b/samples/drivers/mbox/Kconfig.sysbuild @@ -14,6 +14,7 @@ string default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk" default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk" default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69" - default "nrf54h20dk/nrf54h20/cpuppr" if $(BOARD) = "nrf54h20dk" + default "nrf54h20dk/nrf54h20/cpuppr" if "$(BOARD)${BOARD_QUALIFIERS}" = "nrf54h20dk/nrf54h20/cpuapp" + default "nrf54h20dk/nrf54h20/cpuapp" if "$(BOARD)${BOARD_QUALIFIERS}" = "nrf54h20dk/nrf54h20/cpurad" default "nrf54l15pdk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15pdk" default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco" diff --git a/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_bellboard.overlay b/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp.overlay similarity index 62% rename from samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_bellboard.overlay rename to samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 53eec7c680c..2e5aba6d2f0 100644 --- a/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_bellboard.overlay +++ b/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -6,11 +6,15 @@ / { mbox-consumer { compatible = "vnd,mbox-consumer"; - mboxes = <&cpuapp_bellboard 0>; - mbox-names = "tx"; + mboxes = <&cpuppr_vevif 15>, <&cpuapp_bellboard 18>; + mbox-names = "tx", "rx"; }; }; &cpuapp_bellboard { status = "okay"; }; + +&cpuppr_vevif { + status = "okay"; +}; diff --git a/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_bellboard.conf b/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_bellboard.conf deleted file mode 100644 index 0b6bc73d6bc..00000000000 --- a/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_bellboard.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_TX_ENABLED=n diff --git a/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_vevif.conf b/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_vevif.conf deleted file mode 100644 index 4596bc3a757..00000000000 --- a/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_vevif.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_RX_ENABLED=n diff --git a/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_vevif.overlay b/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpurad.overlay similarity index 54% rename from samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_vevif.overlay rename to samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpurad.overlay index 365469e86bd..d2230e8ef20 100644 --- a/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_vevif.overlay +++ b/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -6,11 +6,15 @@ / { mbox-consumer { compatible = "vnd,mbox-consumer"; - mboxes = <&cpuppr_vevif 4>; - mbox-names = "rx"; + mboxes = <&cpuapp_bellboard 18>, <&cpurad_bellboard 12>; + mbox-names = "tx", "rx"; }; }; -&cpuppr_vevif { +&cpuapp_bellboard { + status = "okay"; +}; + +&cpurad_bellboard { status = "okay"; }; diff --git a/samples/drivers/mbox/remote/CMakeLists.txt b/samples/drivers/mbox/remote/CMakeLists.txt index 08823f7b0fc..efaa24db0ce 100644 --- a/samples/drivers/mbox/remote/CMakeLists.txt +++ b/samples/drivers/mbox/remote/CMakeLists.txt @@ -16,6 +16,7 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET OR CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM4 OR CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU1 OR CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUPPR OR + CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUFLPR OR CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP OR CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M4) diff --git a/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_vevif.overlay b/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuapp.overlay similarity index 54% rename from samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_vevif.overlay rename to samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 4e01f9a79d5..899a7cb40a7 100644 --- a/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_vevif.overlay +++ b/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -6,11 +6,15 @@ / { mbox-consumer { compatible = "vnd,mbox-consumer"; - mboxes = <&cpuppr_vevif 4>; - mbox-names = "tx"; + mboxes = <&cpuapp_bellboard 18>, <&cpurad_bellboard 12>; + mbox-names = "rx", "tx"; }; }; -&cpuppr_vevif { +&cpuapp_bellboard { + status = "okay"; +}; + +&cpurad_bellboard { status = "okay"; }; diff --git a/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_bellboard.overlay b/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay similarity index 62% rename from samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_bellboard.overlay rename to samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay index 3618aab1d16..049f2432695 100644 --- a/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_bellboard.overlay +++ b/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay @@ -6,11 +6,15 @@ / { mbox-consumer { compatible = "vnd,mbox-consumer"; - mboxes = <&cpuapp_bellboard 0>; - mbox-names = "rx"; + mboxes = <&cpuppr_vevif 15>, <&cpuapp_bellboard 18>; + mbox-names = "rx", "tx"; }; }; &cpuapp_bellboard { status = "okay"; }; + +&cpuppr_vevif { + status = "okay"; +}; diff --git a/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_bellboard.conf b/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_bellboard.conf deleted file mode 100644 index 4596bc3a757..00000000000 --- a/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_bellboard.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_RX_ENABLED=n diff --git a/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_vevif.conf b/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_vevif.conf deleted file mode 100644 index 0b6bc73d6bc..00000000000 --- a/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_vevif.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_TX_ENABLED=n diff --git a/samples/drivers/mbox/sample.yaml b/samples/drivers/mbox/sample.yaml index 8308e5907d8..01646f040bc 100644 --- a/samples/drivers/mbox/sample.yaml +++ b/samples/drivers/mbox/sample.yaml @@ -24,13 +24,12 @@ tests: - "Ping \\(on channel 1\\)" - "Pong \\(on channel 1\\)" - sample.drivers.mbox.nrf54h20_vevif: + sample.drivers.mbox.nrf54h20_app_ppr: platform_allow: - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - nrf54h20dk/nrf54h20/cpuapp extra_args: - FILE_SUFFIX=vevif mbox_SNIPPET=nordic-ppr sysbuild: true harness: console @@ -38,23 +37,22 @@ tests: type: multi_line ordered: false regex: - - "Ping \\(on channel 4\\)" + - "Ping \\(on channel 15\\)" + - "Pong \\(on channel 18\\)" - sample.drivers.mbox.nrf54h20_bellboard: + sample.drivers.mbox.nrf54h20_rad_app: platform_allow: - - nrf54h20dk/nrf54h20/cpuapp + - nrf54h20dk/nrf54h20/cpurad integration_platforms: - - nrf54h20dk/nrf54h20/cpuapp - extra_args: - FILE_SUFFIX=bellboard - mbox_SNIPPET=nordic-ppr + - nrf54h20dk/nrf54h20/cpurad sysbuild: true harness: console harness_config: type: multi_line ordered: false regex: - - "Pong \\(on channel 0\\)" + - "Ping \\(on channel 18\\)" + - "Pong \\(on channel 12\\)" sample.drivers.mbox.simu: platform_allow: diff --git a/samples/drivers/mbox/sysbuild.cmake b/samples/drivers/mbox/sysbuild.cmake index 769d33d3f77..e2a5a03b87e 100644 --- a/samples/drivers/mbox/sysbuild.cmake +++ b/samples/drivers/mbox/sysbuild.cmake @@ -4,7 +4,7 @@ if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") message(FATAL_ERROR - "Target ${BOARD} not supported for this sample. " + "Target ${BOARD}${BOARD_QUALIFIERS} not supported for this sample. " "There is no remote board selected in Kconfig.sysbuild") endif()