Skip to content

Commit c095d90

Browse files
jaz1-nordicjaz1-nordic
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 d3d3f66 commit c095d90

File tree

7 files changed

+122
-32
lines changed

7 files changed

+122
-32
lines changed

‎samples/drivers/mbox/sample.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ tests:
8585

8686
sample.drivers.mbox.nrf54l15:
8787
platform_allow:
88-
- nrf54l15pdk/nrf54l15/cpuapp
88+
- nrf54l15dk/nrf54l15/cpuapp
8989
integration_platforms:
90-
- nrf54l15pdk/nrf54l15/cpuapp
90+
- nrf54l15dk/nrf54l15/cpuapp
9191
extra_args:
9292
mbox_SNIPPET=nordic-flpr
9393
sysbuild: true
@@ -96,14 +96,14 @@ tests:
9696
type: multi_line
9797
ordered: false
9898
regex:
99-
- "Ping \\(on channel 16\\)"
100-
- "Pong \\(on channel 15\\)"
99+
- "Ping \\(on channel 21\\)"
100+
- "Pong \\(on channel 20\\)"
101101

102102
sample.drivers.mbox.nrf54l15_no_multithreading:
103103
platform_allow:
104-
- nrf54l15pdk/nrf54l15/cpuapp
104+
- nrf54l15dk/nrf54l15/cpuapp
105105
integration_platforms:
106-
- nrf54l15pdk/nrf54l15/cpuapp
106+
- nrf54l15dk/nrf54l15/cpuapp
107107
extra_args:
108108
mbox_SNIPPET=nordic-flpr
109109
mbox_CONFIG_MULTITHREADING=n
@@ -114,14 +114,14 @@ tests:
114114
type: multi_line
115115
ordered: false
116116
regex:
117-
- "Ping \\(on channel 16\\)"
118-
- "Pong \\(on channel 15\\)"
117+
- "Ping \\(on channel 21\\)"
118+
- "Pong \\(on channel 20\\)"
119119

120120
sample.drivers.mbox.nrf54l15_remote_no_multithreading:
121121
platform_allow:
122-
- nrf54l15pdk/nrf54l15/cpuapp
122+
- nrf54l15dk/nrf54l15/cpuapp
123123
integration_platforms:
124-
- nrf54l15pdk/nrf54l15/cpuapp
124+
- nrf54l15dk/nrf54l15/cpuapp
125125
extra_args:
126126
mbox_SNIPPET=nordic-flpr
127127
remote_CONFIG_MULTITHREADING=n
@@ -131,5 +131,5 @@ tests:
131131
type: multi_line
132132
ordered: false
133133
regex:
134-
- "Ping \\(on channel 16\\)"
135-
- "Pong \\(on channel 15\\)"
134+
- "Ping \\(on channel 21\\)"
135+
- "Pong \\(on channel 20\\)"

‎samples/subsys/ipc/ipc_service/icmsg/boards/nrf54l15dk_nrf54l15_cpuapp.overlay‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
/ {
8+
soc {
9+
reserved-memory {
10+
#address-cells = <1>;
11+
#size-cells = <1>;
12+
13+
sram_rx: memory@20018000 {
14+
reg = <0x20018000 0x0800>;
15+
};
16+
17+
sram_tx: memory@20020000 {
18+
reg = <0x20020000 0x0800>;
19+
};
20+
};
21+
};
22+
23+
ipc {
24+
ipc0: ipc0 {
25+
compatible = "zephyr,ipc-icmsg";
26+
tx-region = <&sram_tx>;
27+
rx-region = <&sram_rx>;
28+
mboxes = <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_tx 21>;
29+
mbox-names = "rx", "tx";
30+
status = "okay";
31+
};
32+
};
33+
};
34+
35+
&cpuapp_vevif_rx {
36+
status = "okay";
37+
};
38+
39+
&cpuapp_vevif_tx {
40+
status = "okay";
41+
};

‎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: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
/ {
8+
soc {
9+
reserved-memory {
10+
#address-cells = <1>;
11+
#size-cells = <1>;
12+
13+
sram_tx: memory@20018000 {
14+
reg = <0x20018000 0x0800>;
15+
};
16+
17+
sram_rx: memory@20020000 {
18+
reg = <0x20020000 0x0800>;
19+
};
20+
};
21+
};
22+
23+
ipc {
24+
ipc0: ipc0 {
25+
compatible = "zephyr,ipc-icmsg";
26+
tx-region = <&sram_tx>;
27+
rx-region = <&sram_rx>;
28+
mboxes = <&cpuflpr_vevif_rx 21>, <&cpuflpr_vevif_tx 20>;
29+
mbox-names = "rx", "tx";
30+
status = "okay";
31+
};
32+
};
33+
};
34+
35+
&cpuflpr_vevif_rx {
36+
status = "okay";
37+
};
38+
39+
&cpuflpr_vevif_tx {
40+
status = "okay";
41+
};
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: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ tests:
2020
- "host: IPC-service HOST demo ended"
2121

2222
sample.ipc.icmsg.nrf54l15:
23-
platform_allow: nrf54l15pdk/nrf54l15/cpuapp
23+
platform_allow: nrf54l15dk/nrf54l15/cpuapp
2424
integration_platforms:
25-
- nrf54l15pdk/nrf54l15/cpuapp
25+
- nrf54l15dk/nrf54l15/cpuapp
2626
tags: ipc
2727
extra_args:
2828
icmsg_SNIPPET=nordic-flpr
@@ -40,9 +40,9 @@ tests:
4040
- "host: IPC-service HOST demo ended"
4141

4242
sample.ipc.icmsg.nrf54l15_no_multithreading:
43-
platform_allow: nrf54l15pdk/nrf54l15/cpuapp
43+
platform_allow: nrf54l15dk/nrf54l15/cpuapp
4444
integration_platforms:
45-
- nrf54l15pdk/nrf54l15/cpuapp
45+
- nrf54l15dk/nrf54l15/cpuapp
4646
tags: ipc
4747
extra_args:
4848
icmsg_SNIPPET=nordic-flpr
@@ -64,9 +64,9 @@ tests:
6464
- "I: IPC-service HOST demo ended"
6565

6666
sample.ipc.icmsg.nrf54l15_remote_no_multithreading:
67-
platform_allow: nrf54l15pdk/nrf54l15/cpuapp
67+
platform_allow: nrf54l15dk/nrf54l15/cpuapp
6868
integration_platforms:
69-
- nrf54l15pdk/nrf54l15/cpuapp
69+
- nrf54l15dk/nrf54l15/cpuapp
7070
tags: ipc
7171
extra_args:
7272
icmsg_SNIPPET=nordic-flpr
@@ -86,16 +86,16 @@ tests:
8686
- "host: IPC-service HOST demo ended"
8787

8888
sample.ipc.icbmsg.nrf54l15:
89-
platform_allow: nrf54l15pdk/nrf54l15/cpuapp
89+
platform_allow: nrf54l15dk/nrf54l15/cpuapp
9090
integration_platforms:
91-
- nrf54l15pdk/nrf54l15/cpuapp
91+
- nrf54l15dk/nrf54l15/cpuapp
9292
tags: ipc
9393
extra_args:
9494
icmsg_SNIPPET=nordic-flpr
9595
icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
96-
icmsg_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay"
96+
icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
9797
remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
98-
remote_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay"
98+
remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
9999
sysbuild: true
100100
harness: console
101101
harness_config:
@@ -110,18 +110,18 @@ tests:
110110
- "host: IPC-service HOST demo ended"
111111

112112
sample.ipc.icbmsg.nrf54l15_no_multithreading:
113-
platform_allow: nrf54l15pdk/nrf54l15/cpuapp
113+
platform_allow: nrf54l15dk/nrf54l15/cpuapp
114114
integration_platforms:
115-
- nrf54l15pdk/nrf54l15/cpuapp
115+
- nrf54l15dk/nrf54l15/cpuapp
116116
tags: ipc
117117
extra_args:
118118
icmsg_SNIPPET=nordic-flpr
119119
icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
120-
icmsg_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay"
120+
icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
121121
icmsg_CONFIG_MULTITHREADING=n
122122
icmsg_CONFIG_LOG_MODE_MINIMAL=y
123123
remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
124-
remote_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay"
124+
remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
125125
remote_CONFIG_MULTITHREADING=n
126126
remote_CONFIG_LOG_MODE_MINIMAL=y
127127
sysbuild: true
@@ -138,16 +138,16 @@ tests:
138138
- "host: IPC-service HOST demo ended"
139139

140140
sample.ipc.icbmsg.nrf54l15_remote_no_multithreading:
141-
platform_allow: nrf54l15pdk/nrf54l15/cpuapp
141+
platform_allow: nrf54l15dk/nrf54l15/cpuapp
142142
integration_platforms:
143-
- nrf54l15pdk/nrf54l15/cpuapp
143+
- nrf54l15dk/nrf54l15/cpuapp
144144
tags: ipc
145145
extra_args:
146146
icmsg_SNIPPET=nordic-flpr
147147
icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
148-
icmsg_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuapp_icbmsg.overlay"
148+
icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
149149
remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
150-
remote_DTC_OVERLAY_FILE="boards/nrf54l15pdk_nrf54l15_cpuflpr_icbmsg.overlay"
150+
remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
151151
remote_CONFIG_MULTITHREADING=n
152152
remote_CONFIG_LOG_MODE_MINIMAL=y
153153
sysbuild: true

0 commit comments

Comments
 (0)