Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manifest: sdk-zephyr: [nrf fromtree]dts: nordic: nrf5340: Change nRF5340 IPC backend to icbmsg #17741

Closed
wants to merge 5 commits into from
Closed

manifest: sdk-zephyr: [nrf fromtree]dts: nordic: nrf5340: Change nRF5340 IPC backend to icbmsg #17741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dfa6658
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Oct 8, 2024
9b7d18a
boards: thingy53x: Align nRF5340 IPC configuration
dchat-nordic Oct 10, 2024
d8fb362
treewide: align nRF5340 IPC to icbmsg
gmarull Oct 10, 2024
4f8af0a
snippets: Add snippet enabling legacy rpmsg for nrf5340
dchat-nordic Oct 16, 2024
02eea7e
samples: ipc_service: Adjust ipc_service sample for nrf5340 icbmsg
dchat-nordic Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,12 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <zephyr/dt-bindings/ipc_service/static_vrings.h>

/ {
chosen {
nordic,pm-ext-flash = &mx25r64;
};
};

/* Set IPC thread priority to the highest value to not collide with other threads. */
&ipc0 {
zephyr,priority = <0 PRIO_COOP>;
};

/* Disable unused peripherals to reduce power consumption */
&adc {
status = "disabled";
Expand Down
7 changes: 0 additions & 7 deletions applications/matter_weather_station/app.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <zephyr/dt-bindings/ipc_service/static_vrings.h>

/ {
zephyr,user {
battery-charge-gpios = <&gpio1 0 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
Expand Down Expand Up @@ -65,11 +63,6 @@
};
};

/* Set IPC thread priority to the highest value to not collide with other threads. */
&ipc0 {
zephyr,priority = <0 PRIO_COOP>;
};

&i2c1 {
bme688@76 {
compatible = "bosch,bme680";
Expand Down
30 changes: 0 additions & 30 deletions boards/nordic/thingy91x/nrf5340_shared_sram_planning_conf.dts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,4 +241,4 @@ zephyr_udc0: &usbd {
};

/* Include partition configuration file */
#include "nrf5340_shared_sram_planning_conf.dts"
#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
2 changes: 1 addition & 1 deletion boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@
};

/* Include shared RAM configuration file */
#include "nrf5340_shared_sram_planning_conf.dts"
#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
4 changes: 1 addition & 3 deletions samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#
# Copyright (c) 2022 Nordic Semiconductor ASA
# Copyright (c) 2024 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_SOC_NRF53_CPUNET_ENABLE=y
CONFIG_OPENAMP=y
CONFIG_OPENAMP_SLAVE=n
16 changes: 2 additions & 14 deletions samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_icmsg.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,10 @@
/delete-property/ zephyr,bt-hci;
};

reserved-memory {
/delete-node/ memory@20070000;

sram_tx: memory@20070000 {
reg = <0x20070000 0x8000>;
};

sram_rx: memory@20078000 {
reg = <0x20078000 0x8000>;
};
};

ipc0: ipc0 {
compatible = "zephyr,ipc-icmsg";
tx-region = <&sram_tx>;
rx-region = <&sram_rx>;
tx-region = <&cpuapp_cpunet_ipc_shm>;
rx-region = <&cpunet_cpuapp_ipc_shm>;
mboxes = <&mbox 0>, <&mbox 1>;
mbox-names = "tx", "rx";
status = "okay";
Expand Down
0 ...e/boards/nrf5340dk_nrf5340_cpuapp_ns.conf → ...ds/nrf5340dk_nrf5340_cpuapp_ns_rpmsg.conf
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_rpmsg.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# Copyright (c) 2022 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_SOC_NRF53_CPUNET_ENABLE=y
CONFIG_OPENAMP=y
CONFIG_OPENAMP_SLAVE=n
16 changes: 2 additions & 14 deletions samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet_icmsg.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,10 @@
/delete-property/ zephyr,ipc_shm;
};

reserved-memory {
/delete-node/ memory@20070000;

sram_rx: memory@20070000 {
reg = <0x20070000 0x8000>;
};

sram_tx: memory@20078000 {
reg = <0x20078000 0x8000>;
};
};

ipc0: ipc0 {
compatible = "zephyr,ipc-icmsg";
tx-region = <&sram_tx>;
rx-region = <&sram_rx>;
tx-region = <&cpunet_cpuapp_ipc_shm>;
rx-region = <&cpuapp_cpunet_ipc_shm>;
mboxes = <&mbox 0>, <&mbox 1>;
mbox-names = "rx", "tx";
status = "okay";
Expand Down
0 ...mote/boards/nrf5340dk_nrf5340_cpunet.conf → ...oards/nrf5340dk_nrf5340_cpunet_rpmsg.conf
View file
Open in desktop
File renamed without changes.
69 changes: 54 additions & 15 deletions samples/ipc/ipc_service/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,31 @@ tests:
- nrf5340dk/nrf5340/cpuapp
integration_platforms:
- nrf5340dk/nrf5340/cpuapp
extra_args:
- FILE_SUFFIX=rpmsg
- SNIPPET=nrf53-legacy-rpmsg
sample.ipc.ipc_service.nrf5340dk_rpmsg_cpuapp_sending:
platform_allow:
- nrf5340dk/nrf5340/cpuapp
integration_platforms:
- nrf5340dk/nrf5340/cpuapp
extra_configs:
- CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=1
extra_args: >
remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000
extra_args:
- FILE_SUFFIX=rpmsg
- remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000
- SNIPPET=nrf53-legacy-rpmsg
sample.ipc.ipc_service.nrf5340dk_rpmsg_cpunet_sending:
platform_allow:
- nrf5340dk/nrf5340/cpuapp
integration_platforms:
- nrf5340dk/nrf5340/cpuapp
extra_configs:
- CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000
extra_args: >
remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=1
extra_args:
- FILE_SUFFIX=rpmsg
- remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=1
- SNIPPET=nrf53-legacy-rpmsg
harness_config:
type: multi_line
ordered: true
Expand All @@ -53,28 +60,60 @@ tests:
- nrf5340dk/nrf5340/cpuapp
integration_platforms:
- nrf5340dk/nrf5340/cpuapp
extra_args: >
FILE_SUFFIX=icmsg
extra_args:
- FILE_SUFFIX=icmsg
sample.ipc.ipc_service.nrf5340dk_icmsg_cpuapp_sending:
platform_allow:
- nrf5340dk/nrf5340/cpuapp
integration_platforms:
- nrf5340dk/nrf5340/cpuapp
extra_configs:
- CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=35
extra_args: >
FILE_SUFFIX=icmsg
remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000
extra_args:
- FILE_SUFFIX=icmsg
- remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000
sample.ipc.ipc_service.nrf5340dk_icmsg_cpunet_sending:
platform_allow:
- nrf5340dk/nrf5340/cpuapp
integration_platforms:
- nrf5340dk/nrf5340/cpuapp
extra_configs:
- CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000
extra_args: >
FILE_SUFFIX=icmsg
remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=1
extra_args:
- FILE_SUFFIX=icmsg
- remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=1
harness_config:
type: multi_line
ordered: true
regex:
- "IPC-service .* demo started"
# there will be only single tranfser from this core
- "Δpkt: (?!0)\\d+ ((?!0)\\d+ B/pkt) | throughput: (?!0)\\d+ bit/s"
- "Δpkt: \\d+ (\\d+ B/pkt) | throughput: \\d+ bit/s"
- "Δpkt: \\d+ (\\d+ B/pkt) | throughput: \\d+ bit/s"
sample.ipc.ipc_service.nrf5340dk_icbmsg_default:
platform_allow:
- nrf5340dk/nrf5340/cpuapp
integration_platforms:
- nrf5340dk/nrf5340/cpuapp
sample.ipc.ipc_service.nrf5340dk_icbmsg_cpuapp_sending:
platform_allow:
- nrf5340dk/nrf5340/cpuapp
integration_platforms:
- nrf5340dk/nrf5340/cpuapp
extra_configs:
- CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=35
extra_args:
- remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000
sample.ipc.ipc_service.nrf5340dk_icbmsg_cpunet_sending:
platform_allow:
- nrf5340dk/nrf5340/cpuapp
integration_platforms:
- nrf5340dk/nrf5340/cpuapp
extra_configs:
- CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000
extra_args:
- remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=1
harness_config:
type: multi_line
ordered: true
Expand All @@ -94,6 +133,6 @@ tests:
- nrf54h20dk/nrf54h20/cpuapp
integration_platforms:
- nrf54h20dk/nrf54h20/cpuapp
extra_args: >
FILE_SUFFIX=cpuppr
ipc_service_SNIPPET=nordic-ppr
extra_args:
- FILE_SUFFIX=cpuppr
- ipc_service_SNIPPET=nordic-ppr
7 changes: 0 additions & 7 deletions samples/matter/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <zephyr/dt-bindings/ipc_service/static_vrings.h>

/ {
chosen {
nordic,pm-ext-flash = &mx25r64;
Expand All @@ -28,11 +26,6 @@
};
};

/* Set IPC thread priority to the highest value to not collide with other threads. */
&ipc0 {
zephyr,priority = <0 PRIO_COOP>;
};

&pwm0 {
pinctrl-0 = <&pwm0_default_alt>;
pinctrl-1 = <&pwm0_sleep_alt>;
Expand Down
7 changes: 0 additions & 7 deletions samples/matter/light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <zephyr/dt-bindings/ipc_service/static_vrings.h>

/ {
chosen {
nordic,pm-ext-flash = &mx25r64;
Expand All @@ -29,11 +27,6 @@
};
};

/* Set IPC thread priority to the highest value to not collide with other threads. */
&ipc0 {
zephyr,priority = <0 PRIO_COOP>;
};

&pwm0 {
pinctrl-0 = <&pwm0_default_alt>;
pinctrl-1 = <&pwm0_sleep_alt>;
Expand Down
7 changes: 0 additions & 7 deletions samples/matter/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,12 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <zephyr/dt-bindings/ipc_service/static_vrings.h>

/ {
chosen {
nordic,pm-ext-flash = &mx25r64;
};
};

/* Set IPC thread priority to the highest value to not collide with other threads. */
&ipc0 {
zephyr,priority = <0 PRIO_COOP>;
};

/* Disable unused peripherals to reduce power consumption */
&adc {
status = "disabled";
Expand Down
7 changes: 0 additions & 7 deletions samples/matter/light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <zephyr/dt-bindings/ipc_service/static_vrings.h>

/ {
chosen {
nordic,pm-ext-flash = &mx25r64;
Expand All @@ -15,8 +13,3 @@
watchdog0 = &wdt0;
};
};

/* Set IPC thread priority to the highest value to not collide with other threads. */
&ipc0 {
zephyr,priority = <0 PRIO_COOP>;
};
7 changes: 0 additions & 7 deletions samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,12 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <zephyr/dt-bindings/ipc_service/static_vrings.h>

/ {
chosen {
nordic,pm-ext-flash = &mx25r64;
};
};

/* Set IPC thread priority to the highest value to not collide with other threads. */
&ipc0 {
zephyr,priority = <0 PRIO_COOP>;
};

/* Disable unused peripherals to reduce power consumption */
&adc {
status = "disabled";
Expand Down
7 changes: 0 additions & 7 deletions samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <zephyr/dt-bindings/ipc_service/static_vrings.h>

/ {
chosen {
nordic,pm-ext-flash = &mx25r64;
Expand All @@ -15,8 +13,3 @@
watchdog0 = &wdt0;
};
};

/* Set IPC thread priority to the highest value to not collide with other threads. */
&ipc0 {
zephyr,priority = <0 PRIO_COOP>;
};
Loading
Loading