Skip to content

Commit f61b2a5

Browse files
jaz1-nordickatgiadla
jaz1-nordic
authored and
katgiadla
committed
[nrf fromtree] samples: Align tests yaml and overlays to nrf54l15dk
Align mbox sample.yaml and icmsg flpr overlays to nrf54l15dk. Signed-off-by: Jakub Zymelka <[email protected]> (cherry picked from commit 3904c3b)
1 parent d11817e commit f61b2a5

File tree

6 files changed

+31
-26
lines changed

6 files changed

+31
-26
lines changed

‎samples/drivers/mbox/sample.yaml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ tests:
8686
sample.drivers.mbox.nrf54l15:
8787
platform_allow:
8888
- nrf54l15dk/nrf54l15/cpuapp
89-
- nrf54l15pdk/nrf54l15/cpuapp
9089
integration_platforms:
9190
- nrf54l15dk/nrf54l15/cpuapp
9291
extra_args:
@@ -97,13 +96,12 @@ tests:
9796
type: multi_line
9897
ordered: false
9998
regex:
100-
- "Ping \\(on channel 16\\)"
101-
- "Pong \\(on channel 15\\)"
99+
- "Ping \\(on channel 21\\)"
100+
- "Pong \\(on channel 20\\)"
102101

103102
sample.drivers.mbox.nrf54l15_no_multithreading:
104103
platform_allow:
105104
- nrf54l15dk/nrf54l15/cpuapp
106-
- nrf54l15pdk/nrf54l15/cpuapp
107105
integration_platforms:
108106
- nrf54l15dk/nrf54l15/cpuapp
109107
extra_args:
@@ -116,13 +114,12 @@ tests:
116114
type: multi_line
117115
ordered: false
118116
regex:
119-
- "Ping \\(on channel 16\\)"
120-
- "Pong \\(on channel 15\\)"
117+
- "Ping \\(on channel 21\\)"
118+
- "Pong \\(on channel 20\\)"
121119

122120
sample.drivers.mbox.nrf54l15_remote_no_multithreading:
123121
platform_allow:
124122
- nrf54l15dk/nrf54l15/cpuapp
125-
- nrf54l15pdk/nrf54l15/cpuapp
126123
integration_platforms:
127124
- nrf54l15dk/nrf54l15/cpuapp
128125
extra_args:
@@ -134,5 +131,5 @@ tests:
134131
type: multi_line
135132
ordered: false
136133
regex:
137-
- "Ping \\(on channel 16\\)"
138-
- "Pong \\(on channel 15\\)"
134+
- "Ping \\(on channel 21\\)"
135+
- "Pong \\(on channel 20\\)"

‎samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay‎ renamed to ‎samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
rx-region = <&sram_rx>;
2828
tx-blocks = <16>;
2929
rx-blocks = <18>;
30-
mboxes = <&cpuapp_vevif_rx 15>, <&cpuapp_vevif_tx 16>;
30+
mboxes = <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_tx 21>;
3131
mbox-names = "rx", "tx";
3232
status = "okay";
3333
};

‎samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,7 @@
3939
&cpuflpr_vevif_tx {
4040
status = "okay";
4141
};
42+
43+
&uart30 {
44+
/delete-property/ hw-flow-control;
45+
};

‎samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay‎ renamed to ‎samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
rx-region = <&sram_rx>;
2828
tx-blocks = <18>;
2929
rx-blocks = <16>;
30-
mboxes = <&cpuflpr_vevif_rx 16>, <&cpuflpr_vevif_tx 15>;
30+
mboxes = <&cpuflpr_vevif_rx 21>, <&cpuflpr_vevif_tx 20>;
3131
mbox-names = "rx", "tx";
3232
status = "okay";
3333
};

‎samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,7 @@
3939
&cpuflpr_vevif_tx {
4040
status = "okay";
4141
};
42+
43+
&uart30 {
44+
/delete-property/ hw-flow-control;
45+
};

‎samples/subsys/ipc/ipc_service/icmsg/sample.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ tests:
2323
- "host: IPC-service HOST demo ended"
2424

2525
sample.ipc.icmsg.nrf54l15:
26-
platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
26+
platform_allow: nrf54l15dk/nrf54l15/cpuapp
2727
integration_platforms:
2828
- nrf54l15dk/nrf54l15/cpuapp
2929
tags: ipc
@@ -43,7 +43,7 @@ tests:
4343
- "host: IPC-service HOST demo ended"
4444

4545
sample.ipc.icmsg.nrf54l15_no_multithreading:
46-
platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
46+
platform_allow: nrf54l15dk/nrf54l15/cpuapp
4747
integration_platforms:
4848
- nrf54l15dk/nrf54l15/cpuapp
4949
tags: ipc
@@ -67,7 +67,7 @@ tests:
6767
- "I: IPC-service HOST demo ended"
6868

6969
sample.ipc.icmsg.nrf54l15_remote_no_multithreading:
70-
platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
70+
platform_allow: nrf54l15dk/nrf54l15/cpuapp
7171
integration_platforms:
7272
- nrf54l15dk/nrf54l15/cpuapp
7373
tags: ipc
@@ -89,16 +89,16 @@ tests:
8989
- "host: IPC-service HOST demo ended"
9090

9191
sample.ipc.icbmsg.nrf54l15:
92-
platform_allow: nrf54l15pdk/nrf54l15/cpuapp
92+
platform_allow: nrf54l15dk/nrf54l15/cpuapp
9393
integration_platforms:
94-
- nrf54l15pdk/nrf54l15/cpuapp
94+
- nrf54l15dk/nrf54l15/cpuapp
9595
tags: ipc
9696
extra_args:
9797
icmsg_SNIPPET=nordic-flpr
9898
icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
99-
icmsg_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay"
99+
icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
100100
remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
101-
remote_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay"
101+
remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
102102
sysbuild: true
103103
harness: console
104104
harness_config:
@@ -113,18 +113,18 @@ tests:
113113
- "host: IPC-service HOST demo ended"
114114

115115
sample.ipc.icbmsg.nrf54l15_no_multithreading:
116-
platform_allow: nrf54l15pdk/nrf54l15/cpuapp
116+
platform_allow: nrf54l15dk/nrf54l15/cpuapp
117117
integration_platforms:
118-
- nrf54l15pdk/nrf54l15/cpuapp
118+
- nrf54l15dk/nrf54l15/cpuapp
119119
tags: ipc
120120
extra_args:
121121
icmsg_SNIPPET=nordic-flpr
122122
icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
123-
icmsg_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay"
123+
icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
124124
icmsg_CONFIG_MULTITHREADING=n
125125
icmsg_CONFIG_LOG_MODE_MINIMAL=y
126126
remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
127-
remote_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay"
127+
remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
128128
remote_CONFIG_MULTITHREADING=n
129129
remote_CONFIG_LOG_MODE_MINIMAL=y
130130
sysbuild: true
@@ -141,16 +141,16 @@ tests:
141141
- "host: IPC-service HOST demo ended"
142142

143143
sample.ipc.icbmsg.nrf54l15_remote_no_multithreading:
144-
platform_allow: nrf54l15pdk/nrf54l15/cpuapp
144+
platform_allow: nrf54l15dk/nrf54l15/cpuapp
145145
integration_platforms:
146-
- nrf54l15pdk/nrf54l15/cpuapp
146+
- nrf54l15dk/nrf54l15/cpuapp
147147
tags: ipc
148148
extra_args:
149149
icmsg_SNIPPET=nordic-flpr
150150
icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
151-
icmsg_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay"
151+
icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
152152
remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
153-
remote_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay"
153+
remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
154154
remote_CONFIG_MULTITHREADING=n
155155
remote_CONFIG_LOG_MODE_MINIMAL=y
156156
sysbuild: true

0 commit comments

Comments
 (0)