Skip to content

Commit 797cadf

Browse files
jaz1-nordicjaz1-nordic
committed
[nrf fromlist] samples: ipc: icmsg: Extend support for nRF54LM20A
Extends support and adds new overlays. Upstream PR #: 100029 Signed-off-by: Jakub Zymelka <[email protected]>
1 parent f316ea6 commit 797cadf

File tree

7 files changed

+67
-33
lines changed

7 files changed

+67
-33
lines changed

‎samples/subsys/ipc/ipc_service/icmsg/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
1010

1111
if(NOT CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP AND
1212
NOT CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP AND
13+
NOT CONFIG_BOARD_NRF54LM20DK_NRF54LM20A_CPUAPP AND
1314
NOT CONFIG_BOARD_STM32H747I_DISCO AND
1415
NOT CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUAPP)
1516
message(FATAL_ERROR "${BOARD} is not supported for this sample")

‎samples/subsys/ipc/ipc_service/icmsg/Kconfig.sysbuild‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ string
99
default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
1010
default "nrf5340bsim/nrf5340/cpunet" if $(BOARD) = "nrf5340bsim"
1111
default "nrf54l15dk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15dk"
12+
default "nrf54lm20dk/nrf54lm20a/cpuflpr" if $(BOARD) = "nrf54lm20dk"
1213
default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco"

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
&ipc0 {
8+
compatible = "zephyr,ipc-icbmsg";
9+
tx-blocks = <16>;
10+
rx-blocks = <18>;
11+
status = "okay";
12+
};

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2024 Nordic Semiconductor ASA
2+
* Copyright (c) 2025 Nordic Semiconductor ASA
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -10,24 +10,22 @@
1010
#address-cells = <1>;
1111
#size-cells = <1>;
1212

13-
sram_rx: memory@20018000 {
14-
reg = <0x20018000 0x0800>;
13+
sram_rx: memory@20057c00 {
14+
reg = <0x20057c00 0x8000>;
1515
};
1616

17-
sram_tx: memory@20020000 {
18-
reg = <0x20020000 0x0800>;
17+
sram_tx: memory@2005fc00 {
18+
reg = <0x2005fc00 0x8000>;
1919
};
2020
};
2121
};
2222

2323
ipc {
2424
ipc0: ipc0 {
25-
compatible = "zephyr,ipc-icbmsg";
25+
compatible = "zephyr,ipc-icmsg";
2626
dcache-alignment = <32>;
2727
tx-region = <&sram_tx>;
2828
rx-region = <&sram_rx>;
29-
tx-blocks = <16>;
30-
rx-blocks = <18>;
3129
mboxes = <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_tx 21>;
3230
mbox-names = "rx", "tx";
3331
status = "okay";

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
&ipc0 {
8+
compatible = "zephyr,ipc-icbmsg";
9+
tx-blocks = <18>;
10+
rx-blocks = <16>;
11+
status = "okay";
12+
};

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,22 @@
1010
#address-cells = <1>;
1111
#size-cells = <1>;
1212

13-
sram_tx: memory@20018000 {
14-
reg = <0x20018000 0x0800>;
13+
sram_tx: memory@20057c00 {
14+
reg = <0x20057c00 0x8000>;
1515
};
1616

17-
sram_rx: memory@20020000 {
18-
reg = <0x20020000 0x0800>;
17+
sram_rx: memory@2005fc00 {
18+
reg = <0x2005fc00 0x8000>;
1919
};
2020
};
2121
};
2222

2323
ipc {
2424
ipc0: ipc0 {
25-
compatible = "zephyr,ipc-icbmsg";
25+
compatible = "zephyr,ipc-icmsg";
2626
dcache-alignment = <32>;
2727
tx-region = <&sram_tx>;
2828
rx-region = <&sram_rx>;
29-
tx-blocks = <18>;
30-
rx-blocks = <16>;
3129
mboxes = <&cpuflpr_vevif_rx 21>, <&cpuflpr_vevif_tx 20>;
3230
mbox-names = "rx", "tx";
3331
status = "okay";

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

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ tests:
2424
- "host: Received"
2525
- "host: IPC-service HOST demo ended"
2626

27-
sample.ipc.icmsg.nrf54l15:
28-
platform_allow: nrf54l15dk/nrf54l15/cpuapp
27+
sample.ipc.icmsg.nrf54l:
28+
platform_allow:
29+
- nrf54l15dk/nrf54l15/cpuapp
30+
- nrf54lm20dk/nrf54lm20a/cpuapp
2931
integration_platforms:
3032
- nrf54l15dk/nrf54l15/cpuapp
3133
tags: ipc
@@ -43,8 +45,10 @@ tests:
4345
- "host: Received"
4446
- "host: IPC-service HOST demo ended"
4547

46-
sample.ipc.icmsg.nrf54l15_no_multithreading:
47-
platform_allow: nrf54l15dk/nrf54l15/cpuapp
48+
sample.ipc.icmsg.nrf54l_no_multithreading:
49+
platform_allow:
50+
- nrf54l15dk/nrf54l15/cpuapp
51+
- nrf54lm20dk/nrf54lm20a/cpuapp
4852
integration_platforms:
4953
- nrf54l15dk/nrf54l15/cpuapp
5054
tags: ipc
@@ -67,8 +71,10 @@ tests:
6771
- "I: Received"
6872
- "I: IPC-service HOST demo ended"
6973

70-
sample.ipc.icmsg.nrf54l15_remote_no_multithreading:
71-
platform_allow: nrf54l15dk/nrf54l15/cpuapp
74+
sample.ipc.icmsg.nrf54l_remote_no_multithreading:
75+
platform_allow:
76+
- nrf54l15dk/nrf54l15/cpuapp
77+
- nrf54lm20dk/nrf54lm20a/cpuapp
7278
integration_platforms:
7379
- nrf54l15dk/nrf54l15/cpuapp
7480
tags: ipc
@@ -89,17 +95,19 @@ tests:
8995
- "host: Received"
9096
- "host: IPC-service HOST demo ended"
9197

92-
sample.ipc.icbmsg.nrf54l15:
93-
platform_allow: nrf54l15dk/nrf54l15/cpuapp
98+
sample.ipc.icbmsg.nrf54l:
99+
platform_allow:
100+
- nrf54l15dk/nrf54l15/cpuapp
101+
- nrf54lm20dk/nrf54lm20a/cpuapp
94102
integration_platforms:
95103
- nrf54l15dk/nrf54l15/cpuapp
96104
tags: ipc
97105
extra_args:
98106
- icmsg_SNIPPET=nordic-flpr
99107
- icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
100-
- icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
108+
- icmsg_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l_cpuapp_icbmsg.overlay"
101109
- remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
102-
- remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
110+
- remote_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l_cpuflpr_icbmsg.overlay"
103111
sysbuild: true
104112
harness: console
105113
harness_config:
@@ -113,19 +121,21 @@ tests:
113121
- "host: Received"
114122
- "host: IPC-service HOST demo ended"
115123

116-
sample.ipc.icbmsg.nrf54l15_no_multithreading:
117-
platform_allow: nrf54l15dk/nrf54l15/cpuapp
124+
sample.ipc.icbmsg.nrf54l_no_multithreading:
125+
platform_allow:
126+
- nrf54l15dk/nrf54l15/cpuapp
127+
- nrf54lm20dk/nrf54lm20a/cpuapp
118128
integration_platforms:
119129
- nrf54l15dk/nrf54l15/cpuapp
120130
tags: ipc
121131
extra_args:
122132
- icmsg_SNIPPET=nordic-flpr
123133
- icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
124-
- icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
134+
- icmsg_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l_cpuapp_icbmsg.overlay"
125135
- icmsg_CONFIG_MULTITHREADING=n
126136
- icmsg_CONFIG_LOG_MODE_MINIMAL=y
127137
- remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
128-
- remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
138+
- remote_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l_cpuflpr_icbmsg.overlay"
129139
- remote_CONFIG_MULTITHREADING=n
130140
- remote_CONFIG_LOG_MODE_MINIMAL=y
131141
sysbuild: true
@@ -141,17 +151,19 @@ tests:
141151
- "I: Received"
142152
- "I: IPC-service HOST demo ended"
143153

144-
sample.ipc.icbmsg.nrf54l15_remote_no_multithreading:
145-
platform_allow: nrf54l15dk/nrf54l15/cpuapp
154+
sample.ipc.icbmsg.nrf54l_remote_no_multithreading:
155+
platform_allow:
156+
- nrf54l15dk/nrf54l15/cpuapp
157+
- nrf54lm20dk/nrf54lm20a/cpuapp
146158
integration_platforms:
147159
- nrf54l15dk/nrf54l15/cpuapp
148160
tags: ipc
149161
extra_args:
150162
- icmsg_SNIPPET=nordic-flpr
151163
- icmsg_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
152-
- icmsg_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_icbmsg.overlay"
164+
- icmsg_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l_cpuapp_icbmsg.overlay"
153165
- remote_CONFIG_IPC_SERVICE_BACKEND_ICBMSG_NUM_EP=1
154-
- remote_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_icbmsg.overlay"
166+
- remote_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l_cpuflpr_icbmsg.overlay"
155167
- remote_CONFIG_MULTITHREADING=n
156168
- remote_CONFIG_LOG_MODE_MINIMAL=y
157169
sysbuild: true

0 commit comments

Comments
 (0)