diff --git a/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay b/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay index d941f278a4d7..af8026e467ad 100644 --- a/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -4,19 +4,12 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - / { 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"; diff --git a/applications/matter_weather_station/app.overlay b/applications/matter_weather_station/app.overlay index e144314bd497..85ef5f85478c 100644 --- a/applications/matter_weather_station/app.overlay +++ b/applications/matter_weather_station/app.overlay @@ -4,8 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - / { zephyr,user { battery-charge-gpios = <&gpio1 0 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; @@ -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"; diff --git a/boards/nordic/thingy91x/nrf5340_shared_sram_planning_conf.dts b/boards/nordic/thingy91x/nrf5340_shared_sram_planning_conf.dts deleted file mode 100644 index a3b9276ffd22..000000000000 --- a/boards/nordic/thingy91x/nrf5340_shared_sram_planning_conf.dts +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Default shared SRAM planning when building for nRF5340. - * This file is included by both nRF5340 CPUAPP (Application MCU) - * and nRF5340 CPUNET (Network MCU). - * - 64 kB SRAM allocated as Shared memory (sram0_shared) - * - Region defined after the image SRAM of Application MCU - */ - -/ { - chosen { - /* shared memory reserved for the inter-processor communication */ - zephyr,ipc_shm = &sram0_shared; - }; - - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - sram0_shared: memory@20070000 { - /* SRAM allocated to shared memory */ - reg = <0x20070000 0x10000>; - }; - }; -}; diff --git a/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dts b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dts index 7358bb1948d4..52f7e6759af6 100644 --- a/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dts +++ b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dts @@ -241,4 +241,4 @@ zephyr_udc0: &usbd { }; /* Include partition configuration file */ -#include "nrf5340_shared_sram_planning_conf.dts" +#include diff --git a/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.dts b/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.dts index e61f83382c80..b93eae661ba5 100644 --- a/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.dts +++ b/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.dts @@ -82,4 +82,4 @@ }; /* Include shared RAM configuration file */ -#include "nrf5340_shared_sram_planning_conf.dts" +#include diff --git a/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp.conf index 92d3547aacf9..8cca3a9ce654 100644 --- a/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp.conf +++ b/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp.conf @@ -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 diff --git a/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_icmsg.overlay b/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_icmsg.overlay index d446a389f227..6269516a4f9e 100644 --- a/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_icmsg.overlay +++ b/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_icmsg.overlay @@ -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"; diff --git a/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_ns.conf b/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_ns_rpmsg.conf similarity index 100% rename from samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_ns.conf rename to samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_ns_rpmsg.conf diff --git a/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_rpmsg.conf b/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_rpmsg.conf new file mode 100644 index 000000000000..92d3547aacf9 --- /dev/null +++ b/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_rpmsg.conf @@ -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 diff --git a/samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet_icmsg.overlay b/samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet_icmsg.overlay index 57d62e331597..494da6b2f31c 100644 --- a/samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet_icmsg.overlay +++ b/samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet_icmsg.overlay @@ -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"; diff --git a/samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet_rpmsg.conf similarity index 100% rename from samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet.conf rename to samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet_rpmsg.conf diff --git a/samples/ipc/ipc_service/sample.yaml b/samples/ipc/ipc_service/sample.yaml index 76da955e44e7..faf3e0adbd9a 100644 --- a/samples/ipc/ipc_service/sample.yaml +++ b/samples/ipc/ipc_service/sample.yaml @@ -21,6 +21,9 @@ 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 @@ -28,8 +31,10 @@ tests: - 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 @@ -37,8 +42,10 @@ tests: - 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 @@ -53,8 +60,8 @@ 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 @@ -62,9 +69,9 @@ tests: - 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 @@ -72,9 +79,41 @@ tests: - 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 @@ -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 diff --git a/samples/matter/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay index 77d60d7e72ee..ac99bed43077 100644 --- a/samples/matter/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -4,8 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - / { chosen { nordic,pm-ext-flash = &mx25r64; @@ -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>; diff --git a/samples/matter/light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay index fe746730297a..4fbc5f9526a3 100644 --- a/samples/matter/light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -4,8 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - / { chosen { nordic,pm-ext-flash = &mx25r64; @@ -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>; diff --git a/samples/matter/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay index b2f9923aa7e7..38c54b959524 100644 --- a/samples/matter/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -4,19 +4,12 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - / { 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"; diff --git a/samples/matter/light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay index 280120007ef4..6b87f70be9c4 100644 --- a/samples/matter/light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -4,8 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - / { chosen { nordic,pm-ext-flash = &mx25r64; @@ -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>; -}; diff --git a/samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay index b2f9923aa7e7..38c54b959524 100644 --- a/samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -4,19 +4,12 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - / { 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"; diff --git a/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay index 280120007ef4..6b87f70be9c4 100644 --- a/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -4,8 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - / { chosen { nordic,pm-ext-flash = &mx25r64; @@ -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>; -}; diff --git a/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay b/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay index 837e117d126a..6b87f70be9c4 100644 --- a/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay +++ b/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay @@ -4,8 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - / { chosen { nordic,pm-ext-flash = &mx25r64; @@ -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>; -}; diff --git a/samples/matter/smoke_co_alarm/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/smoke_co_alarm/boards/nrf5340dk_nrf5340_cpuapp.overlay index fe200de812e0..085d53aafb4a 100644 --- a/samples/matter/smoke_co_alarm/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/smoke_co_alarm/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -4,19 +4,12 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - / { 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"; diff --git a/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay index b2f9923aa7e7..38c54b959524 100644 --- a/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -4,19 +4,12 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - / { 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"; diff --git a/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay index 79e4b79812f0..8217ed4c19db 100644 --- a/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -4,8 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - / { chosen { nordic,pm-ext-flash = &mx25r64; @@ -16,8 +14,3 @@ }; }; - -/* Set IPC thread priority to the highest value to not collide with other threads. */ -&ipc0 { - zephyr,priority = <0 PRIO_COOP>; -}; diff --git a/samples/matter/window_covering/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/window_covering/boards/nrf5340dk_nrf5340_cpuapp.overlay index 765764531f5e..b4fff1356e01 100644 --- a/samples/matter/window_covering/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/window_covering/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -4,8 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - / { chosen { nordic,pm-ext-flash = &mx25r64; @@ -31,11 +29,6 @@ }; }; -/* 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"; diff --git a/snippets/nrf53-legacy-rpmsg/cores/cpuapp.overlay b/snippets/nrf53-legacy-rpmsg/cores/cpuapp.overlay new file mode 100644 index 000000000000..3ab9eb04c16e --- /dev/null +++ b/snippets/nrf53-legacy-rpmsg/cores/cpuapp.overlay @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ +/delete-node/ &ipc0; +/delete-node/ &cpuapp_cpunet_ipc_shm; +/delete-node/ &cpunet_cpuapp_ipc_shm; + +/ { + + ipc { + ipc0: ipc0 { + compatible = "zephyr,ipc-openamp-static-vrings"; + memory-region = <&sram0_shared>; + mboxes = <&mbox 0>, <&mbox 1>; + mbox-names = "tx", "rx"; + role = "host"; + status = "okay"; + bt_hci_ipc0: bt_hci_ipc0 { + compatible = "zephyr,bt-hci-ipc"; + status = "okay"; + }; + }; + }; +}; diff --git a/snippets/nrf53-legacy-rpmsg/cores/cpunet.overlay b/snippets/nrf53-legacy-rpmsg/cores/cpunet.overlay new file mode 100644 index 000000000000..17b7345bed40 --- /dev/null +++ b/snippets/nrf53-legacy-rpmsg/cores/cpunet.overlay @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ +/delete-node/ &ipc0; +/delete-node/ &cpuapp_cpunet_ipc_shm; +/delete-node/ &cpunet_cpuapp_ipc_shm; + +/ { + ipc { + ipc0: ipc0 { + compatible = "zephyr,ipc-openamp-static-vrings"; + memory-region = <&sram0_shared>; + mboxes = <&mbox 0>, <&mbox 1>; + mbox-names = "rx", "tx"; + role = "remote"; + status = "okay"; + }; + }; +}; diff --git a/snippets/nrf53-legacy-rpmsg/snippet.yml b/snippets/nrf53-legacy-rpmsg/snippet.yml new file mode 100644 index 000000000000..94306f7292c9 --- /dev/null +++ b/snippets/nrf53-legacy-rpmsg/snippet.yml @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +name: nrf53-legacy-rpmsg + +boards: + /.*\/nrf5340\/cpuapp/: + append: + EXTRA_DTC_OVERLAY_FILE: cores/cpuapp.overlay + /.*\/nrf5340\/cpunet/: + append: + EXTRA_DTC_OVERLAY_FILE: cores/cpunet.overlay diff --git a/tests/subsys/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/subsys/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp.overlay deleted file mode 100644 index ac5d195aa7e2..000000000000 --- a/tests/subsys/event_manager_proxy/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ -#include - -&ipc0 { - zephyr,priority = <0 PRIO_PREEMPT>; -}; diff --git a/tests/subsys/event_manager_proxy/remote/boards/nrf5340dk_nrf5340_cpunet.overlay b/tests/subsys/event_manager_proxy/remote/boards/nrf5340dk_nrf5340_cpunet.overlay deleted file mode 100644 index ac5d195aa7e2..000000000000 --- a/tests/subsys/event_manager_proxy/remote/boards/nrf5340dk_nrf5340_cpunet.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ -#include - -&ipc0 { - zephyr,priority = <0 PRIO_PREEMPT>; -}; diff --git a/west.yml b/west.yml index f2b9420d7c92..f4783663a22e 100644 --- a/west.yml +++ b/west.yml @@ -72,7 +72,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 91e394a6321c8dae05131e704b7c8c0fd570f31f + revision: pull/2080/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -210,7 +210,7 @@ manifest: compare-by-default: false - name: sidewalk repo-path: sdk-sidewalk - revision: b27c0fb61d927936b823b5a2b0d79f1752e6c496 + revision: pull/628/head groups: - sidewalk - name: find-my