michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: drivers: mbox: Fix overlays for nrf54h20

Browse source 
Add sample configuration 'nrf54h20_app_ppr' where:
- cpuapp sends messages to cpuppr vevif channel 15,
- cpuppr sends messages to cpuapp bellboard channel 18.

Add sample configuration 'nrf54h20_rad_app' where:
- cpuapp sends messages to cpurad bellboard channel 12,
- cpurad sends messages to cpuapp bellboard channel 18.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
This commit is contained in:
Sebastian Głąb 2024-06-26 13:43:16 +02:00 • committed by Anas Nashif
commit 92b0d6dda5
13 changed files with 39 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
samples/drivers/mbox/CMakeLists.txt
View file

@ -18,6 +18,7 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR
CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR
CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0 OR CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0 OR
CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR
CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD OR
CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP OR CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP OR
CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M7) CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M7)
message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as Main in this sample") message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as Main in this sample")

3
samples/drivers/mbox/Kconfig.sysbuild
View file

@ -14,6 +14,7 @@ string
default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk" default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk"
default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk" default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk"
default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69" 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 "nrf54l15pdk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15pdk"
default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco" default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco"

8
samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_bellboard.overlay → samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
View file

@ -6,11 +6,15 @@
/ { / {
mbox-consumer { mbox-consumer {
compatible = "vnd,mbox-consumer"; compatible = "vnd,mbox-consumer";
mboxes = <&cpuapp_bellboard 0>; mboxes = <&cpuppr_vevif 15>, <&cpuapp_bellboard 18>;
mbox-names = "tx"; mbox-names = "tx", "rx";
}; };
}; };
&cpuapp_bellboard { &cpuapp_bellboard {
status = "okay"; status = "okay";
}; };
&cpuppr_vevif {
status = "okay";
};

1
samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_bellboard.conf
View file

@ -1 +0,0 @@
CONFIG_TX_ENABLED=n

1
samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_vevif.conf
View file

@ -1 +0,0 @@
CONFIG_RX_ENABLED=n

10
samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_vevif.overlay → samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpurad.overlay
View file

@ -6,11 +6,15 @@
/ { / {
mbox-consumer { mbox-consumer {
compatible = "vnd,mbox-consumer"; compatible = "vnd,mbox-consumer";
mboxes = <&cpuppr_vevif 4>; mboxes = <&cpuapp_bellboard 18>, <&cpurad_bellboard 12>;
mbox-names = "rx"; mbox-names = "tx", "rx";
}; };
}; };
&cpuppr_vevif { &cpuapp_bellboard {
status = "okay";
};
&cpurad_bellboard {
status = "okay"; status = "okay";
}; };

1
samples/drivers/mbox/remote/CMakeLists.txt
View file

@ -16,6 +16,7 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET OR
CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM4 OR CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM4 OR
CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU1 OR CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU1 OR
CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUPPR OR CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUPPR OR
CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR
CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUFLPR OR CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUFLPR OR
CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP OR CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUFLPR_XIP OR
CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M4) CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M4)

10
samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_vevif.overlay → samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
View file

@ -6,11 +6,15 @@
/ { / {
mbox-consumer { mbox-consumer {
compatible = "vnd,mbox-consumer"; compatible = "vnd,mbox-consumer";
mboxes = <&cpuppr_vevif 4>; mboxes = <&cpuapp_bellboard 18>, <&cpurad_bellboard 12>;
mbox-names = "tx"; mbox-names = "rx", "tx";
}; };
}; };
&cpuppr_vevif { &cpuapp_bellboard {
status = "okay";
};
&cpurad_bellboard {
status = "okay"; status = "okay";
}; };

8
samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_bellboard.overlay → samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
View file

@ -6,11 +6,15 @@
/ { / {
mbox-consumer { mbox-consumer {
compatible = "vnd,mbox-consumer"; compatible = "vnd,mbox-consumer";
mboxes = <&cpuapp_bellboard 0>; mboxes = <&cpuppr_vevif 15>, <&cpuapp_bellboard 18>;
mbox-names = "rx"; mbox-names = "rx", "tx";
}; };
}; };
&cpuapp_bellboard { &cpuapp_bellboard {
status = "okay"; status = "okay";
}; };
&cpuppr_vevif {
status = "okay";
};

1
samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_bellboard.conf
View file

@ -1 +0,0 @@
CONFIG_RX_ENABLED=n

1
samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuppr_vevif.conf
View file

@ -1 +0,0 @@
CONFIG_TX_ENABLED=n

18
samples/drivers/mbox/sample.yaml
View file

@ -24,13 +24,12 @@ tests:
- "Ping \\(on channel 1\\)" - "Ping \\(on channel 1\\)"
- "Pong \\(on channel 1\\)" - "Pong \\(on channel 1\\)"
sample.drivers.mbox.nrf54h20_vevif: sample.drivers.mbox.nrf54h20_app_ppr:
platform_allow: platform_allow:
- nrf54h20dk/nrf54h20/cpuapp - nrf54h20dk/nrf54h20/cpuapp
integration_platforms: integration_platforms:
- nrf54h20dk/nrf54h20/cpuapp - nrf54h20dk/nrf54h20/cpuapp
extra_args: extra_args:
FILE_SUFFIX=vevif
mbox_SNIPPET=nordic-ppr mbox_SNIPPET=nordic-ppr
sysbuild: true sysbuild: true
harness: console harness: console
@ -38,23 +37,22 @@ tests:
type: multi_line type: multi_line
ordered: false ordered: false
regex: 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: platform_allow:
- nrf54h20dk/nrf54h20/cpuapp - nrf54h20dk/nrf54h20/cpurad
integration_platforms: integration_platforms:
- nrf54h20dk/nrf54h20/cpuapp - nrf54h20dk/nrf54h20/cpurad
extra_args:
FILE_SUFFIX=bellboard
mbox_SNIPPET=nordic-ppr
sysbuild: true sysbuild: true
harness: console harness: console
harness_config: harness_config:
type: multi_line type: multi_line
ordered: false ordered: false
regex: regex:
- "Pong \\(on channel 0\\)" - "Ping \\(on channel 18\\)"
- "Pong \\(on channel 12\\)"
sample.drivers.mbox.simu: sample.drivers.mbox.simu:
platform_allow: platform_allow:

2
samples/drivers/mbox/sysbuild.cmake
View file

@ -4,7 +4,7 @@
if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "")
message(FATAL_ERROR 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") "There is no remote board selected in Kconfig.sysbuild")
endif() endif()