Skip to content

Commit 4c1d67b

Browse files
ankunsrlubos
authored andcommitted
samples: nrf5340: remove deprecated multiprotocol_rpmsg
The `multiprotocol_rpmsg` sample for the nrf5340 is removed. The functionality is taken over by the `ipc_radio` application. Signed-off-by: Andrzej Kuros <[email protected]>
1 parent d9500b9 commit 4c1d67b

File tree

20 files changed

+13
-477
lines changed

20 files changed

+13
-477
lines changed

.github/test-spec.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240
- "subsys/bluetooth/services/nus.c"
241241
- "drivers/mpsl/**/*"
242242
- "dts/bindings/radio_fem/**/*"
243-
- "samples/nrf5340/multiprotocol_rpmsg/**/*"
243+
- "applications/ipc_radio/**/*"
244244
- "modules/nrfxlib/nrf_802154/**/*"
245245
- "modules/mcuboot/**/*"
246246
- "applications/zigbee_weather_station/**/*"
@@ -313,7 +313,7 @@
313313
- "subsys/nrf_rpc/**/*"
314314
- "drivers/mpsl/**/*"
315315
- "dts/bindings/radio_fem/**/*"
316-
- "samples/nrf5340/multiprotocol_rpmsg/**/*"
316+
- "applications/ipc_radio/**/*"
317317
- "modules/nrfxlib/nrf_802154/**/*"
318318
- "samples/CMakeLists.txt"
319319

@@ -326,7 +326,7 @@
326326
- "drivers/mpsl/**/*"
327327
- "boards/shields/**/*"
328328
- "dts/bindings/radio_fem/**/*"
329-
- "samples/nrf5340/multiprotocol_rpmsg/**/*"
329+
- "applications/ipc_radio/**/*"
330330
- "modules/nrfxlib/nrf_802154/**/*"
331331
- "samples/CMakeLists.txt"
332332

@@ -374,7 +374,7 @@
374374
- "samples/matter/**/*"
375375
- "applications/matter_bridge/**/*"
376376
- "applications/matter_weather_station/**/*"
377-
- "samples/nrf5340/multiprotocol_rpmsg/**/*"
377+
- "applications/ipc_radio/**/*"
378378

379379
"CI-find-my-test":
380380
- "CMakeLists.txt"

CODEOWNERS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,6 @@
499499
/samples/net/ @nrfconnect/ncs-cia @nrfconnect/ncs-modem
500500
/samples/nfc/ @nrfconnect/ncs-si-muffin
501501
/samples/nrf5340/netboot/ @nrfconnect/ncs-pluto
502-
/samples/nrf5340/multiprotocol_rpmsg/ @hubertmis
503502
/samples/nrf_rpc/ @nrfconnect/ncs-si-muffin
504503
/samples/sensor/bh1749/ @nrfconnect/ncs-cia
505504
/samples/sensor/bme68x_iaq/ @nrfconnect/ncs-cia
@@ -624,7 +623,6 @@
624623
/samples/nrf5340/empty_app_core/*.rst @nrfconnect/ncs-si-muffin-doc
625624
/samples/nrf5340/empty_net_core/*.rst @nrfconnect/ncs-si-bluebagel-doc
626625
/samples/nrf5340/extxip_smp_svr/*.rst @nrfconnect/ncs-pluto-doc
627-
/samples/nrf5340/multiprotocol_rpmsg/*.rst @nrfconnect/ncs-doc-leads
628626
/samples/nrf5340/netboot/*.rst @nrfconnect/ncs-pluto-doc
629627
/samples/nrf5340/remote_shell/*.rst @nrfconnect/ncs-si-muffin-doc
630628
/samples/nrf_compress/mcuboot_update/*.rst @nrfconnect/ncs-vestavind-doc

doc/nrf/app_dev/config_and_build/sysbuild/sysbuild_images.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ These options determine whether the secure boot image is included on the network
4747
+---------------------------------------------------------+-----------------------------------------------------------------------------------------------------------+
4848
| ``SB_CONFIG_NETCORE_802154_RPMSG`` | Zephyr 802.15.4 image :zephyr:code-sample:`nrf_ieee802154_rpmsg`. |
4949
+---------------------------------------------------------+-----------------------------------------------------------------------------------------------------------+
50-
| ``SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG`` | |NCS| multiprotocol_rpmsg Bluetooth and 802.15.4 image :ref:`multiprotocol-rpmsg-sample`. |
51-
+---------------------------------------------------------+-----------------------------------------------------------------------------------------------------------+
5250
| ``SB_CONFIG_NETCORE_IPC_RADIO`` | |NCS| ipc_radio image :ref:`ipc_radio`. |
5351
+---------------------------------------------------------+-----------------------------------------------------------------------------------------------------------+
5452
| ``SB_CONFIG_NETCORE_NONE`` | No network core image. |

doc/nrf/app_dev/config_and_build/sysbuild/zephyr_samples_sysbuild.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ For applications and samples in the |NCS| repository, this is handled automatica
2020
+---------------------------------------------------------+--------------------------------------------+-----------+----------+-----------------------------------------------------------------------------------------------------------------------+
2121
| ``SB_CONFIG_NETCORE_802154_RPMSG`` | :zephyr:code-sample:`nrf_ieee802154_rpmsg` ||| |
2222
+---------------------------------------------------------+--------------------------------------------+-----------+----------+-----------------------------------------------------------------------------------------------------------------------+
23-
| ``SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG`` | :ref:`multiprotocol-rpmsg-sample` ||| |
24-
+---------------------------------------------------------+--------------------------------------------+-----------+----------+-----------------------------------------------------------------------------------------------------------------------+
2523
| ``SB_CONFIG_NETCORE_IPC_RADIO`` | :ref:`ipc_radio` ||| Requires additional configuration. The following Kconfig options provide predefined configurations: |
2624
| | | | | ``SB_CONFIG_NETCORE_IPC_RADIO_BT_HCI_IPC`` enables HCI serialization |
2725
| | | | | for Bluetooth, ``SB_CONFIG_NETCORE_IPC_RADIO_BT_RPC`` enables nRF RPC serialization for Bluetooth, or |
@@ -34,7 +32,7 @@ The default for Thingy:53 is the :ref:`nrf5340_empty_net_core` sample applicatio
3432
The default for other nRF53 devices is having no image added to the build.
3533

3634
When configuring an application, such as :zephyr:code-sample:`ble_peripheral_hr`, you must configure it with a supported network core image to ensure proper functionality.
37-
For basic Bluetooth samples, you can use :zephyr:code-sample:`bluetooth_hci_ipc`, :ref:`multiprotocol-rpmsg-sample`, or :ref:`ipc_radio` (one of the :ref:`companion components <companion_components>`).
35+
For basic Bluetooth samples, you can use :zephyr:code-sample:`bluetooth_hci_ipc`, or :ref:`ipc_radio` (one of the :ref:`companion components <companion_components>`).
3836
Use one of the following command patterns to build a sample with the :zephyr:code-sample:`bluetooth_hci_ipc` network image selected (with the relevant *board_target*, path to your application *app_dir*, and path to Zephyr's shared sysbuild directory *<path_to_zephyr>/share/sysbuild*):
3937

4038
.. tabs::

doc/nrf/app_dev/device_guides/nrf53/building_nrf53.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ To program the nRF5340 DK from the command line, use either west (which uses nrf
9898
* :file:`rpc_host`
9999
* :file:`hci_rpsmg`
100100
* :file:`802154_rpmsg`
101-
* :file:`multiprotocol_rpmsg`
101+
* :file:`ipc_radio`
102102

103103
#. Navigate to the build folder of the application sample and run the following command to erase the flash memory of the application core and program the application sample:
104104

doc/nrf/app_dev/device_guides/nrf53/features_nrf53.rst

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ Multiprotocol support for the nRF5340 DK
215215

216216
* - Network core
217217
- Application core
218-
* - :ref:`multiprotocol-rpmsg-sample`
218+
* - :ref:`ipc_radio`
219219
- | :ref:`Thread samples <openthread_samples>`
220220
| :ref:`Zigbee samples <zigbee_samples>`
221221
@@ -227,10 +227,8 @@ When using Thread or Zigbee in parallel with Bluetooth LE, run the low-level rad
227227

228228
Bluetooth LE and IEEE 802.15.4 multiprotocol architecture in multicore SoC
229229

230-
For the network core, the |NCS| provides the :ref:`multiprotocol-rpmsg-sample` sample.
231-
It is a combination of the :zephyr:code-sample:`bluetooth_hci_ipc` sample (for Bluetooth LE) and the :zephyr:code-sample:`nrf_ieee802154_rpmsg` sample (for IEEE 802.15.4).
232-
This means that it enables both the Bluetooth LE Controller and the nRF IEEE 802.15.4 radio driver and simultaneously exposes the functionality of both stacks to the application core using the `RPMsg Messaging Protocol`_.
233-
Separate RPMsg endpoints are used to obtain independent inter-core connections for each stack.
230+
For the network core, the |NCS| provides the :ref:`ipc_radio`.
231+
The :ref:`ipc_radio` enables both the Bluetooth LE Controller and the nRF IEEE 802.15.4 radio driver and simultaneously exposes the functionality of both stacks to the application.
234232

235233
For the application core, the |NCS| provides a series of samples for the :ref:`Thread <ug_thread>` and :ref:`Zigbee <ug_zigbee>` protocols.
236234
|multi_image|

doc/nrf/app_dev/device_guides/nrf53/multi_image_nrf5340.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ The combination of these options determines which (if any) sample is included in
4747
* - :kconfig:option:`CONFIG_NRF_802154_SER_HOST`
4848
- :zephyr:code-sample:`nrf_ieee802154_rpmsg`
4949
- ---
50-
* - :kconfig:option:`CONFIG_BT_HCI_IPC` and :kconfig:option:`CONFIG_NRF_802154_SER_HOST`
51-
- :ref:`multiprotocol-rpmsg-sample`
52-
- ---
5350
* - :kconfig:option:`CONFIG_NCS_SAMPLE_EMPTY_APP_CORE_CHILD_IMAGE`
5451
- ---
5552
- :ref:`nrf5340_empty_app_core`

doc/nrf/protocols/matter/getting_started/transmission_power.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ You can do this by either editing the :file:`prj.conf` file or building the samp
158158
The parameter name varies depending on the devices you are building for.
159159
For example:
160160

161-
* If you want to build for Thread devices for the ``nrf5340dk/nrf5340/cpuapp`` board target with a Bluetooth LE TX power equal to 3 dBm, add ``-Dmultiprotocol_rpmsg_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y`` as the CMake argument.
161+
* If you want to build for Thread devices for the ``nrf5340dk/nrf5340/cpuapp`` board target with a Bluetooth LE TX power equal to 3 dBm, add ``-Dipc_radio_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y`` as the CMake argument.
162162
* If you want to build for Wi-Fi® devices for the ``nrf7002dk/nrf5340/cpuapp`` board target with a Bluetooth LE TX power equal to 3 dBm, add ``-Dhci_ipc_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y`` as the CMake argument.
163163

164164
See `nRF Connect for VS Code extension pack <How to work with build configurations_>`_ documentation for more information.
@@ -174,7 +174,7 @@ You can do this by either editing the :file:`prj.conf` file or building the samp
174174

175175
.. code-block:: console
176176
177-
west build -b nrf5340dk/nrf5340/cpuapp -- -Dmultiprotocol_rpmsg_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y
177+
west build -b nrf5340dk/nrf5340/cpuapp -- -Dipc_radio_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y
178178
179179
* If you want to build for Wi-Fi® devices for the ``nrf7002dk/nrf5340/cpuapp`` board target with a Bluetooth LE TX power equal to 3 dBm, run the following command:
180180

doc/nrf/releases_and_maturity/migration/migration_sysbuild.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ The following Kconfig options are available to include the desired image in the
102102
+---------------------------------------------------------+-----------------------------------------------------------------------------------------------------------+
103103
| ``SB_CONFIG_NETCORE_802154_RPMSG`` | Zephyr 802.15.4 image: :zephyr:code-sample:`nrf_ieee802154_rpmsg` |
104104
+---------------------------------------------------------+-----------------------------------------------------------------------------------------------------------+
105-
| ``SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG`` | |NCS| multiprotocol_rpmsg Bluetooth and 802.15.4 image: :ref:`multiprotocol-rpmsg-sample` |
106-
+---------------------------------------------------------+-----------------------------------------------------------------------------------------------------------+
107105
| ``SB_CONFIG_NETCORE_IPC_RADIO`` | |NCS| ipc_radio image: :ref:`ipc_radio` |
108106
+---------------------------------------------------------+-----------------------------------------------------------------------------------------------------------+
109107
| ``SB_CONFIG_NETCORE_NONE`` | No network core image |

samples/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ if (CONFIG_NCS_INCLUDE_RPMSG_CHILD_IMAGE OR CONFIG_NCS_SAMPLE_EMPTY_NET_CORE_CHI
7676
set(CHILD_IMAGE_NAME "empty_net_core")
7777
set(CHILD_IMAGE_PATH "${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/empty_net_core")
7878

79-
elseif (CONFIG_NCS_SAMPLE_MULTIPROTOCOL_RPMSG_CHILD_IMAGE)
80-
set(CHILD_IMAGE_NAME "multiprotocol_rpmsg")
81-
set(CHILD_IMAGE_PATH "${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/multiprotocol_rpmsg")
82-
8379
elseif (CONFIG_NCS_SAMPLE_HCI_IPC_CHILD_IMAGE)
8480
set(CHILD_IMAGE_NAME "hci_ipc")
8581
set(CHILD_IMAGE_PATH "${ZEPHYR_BASE}/samples/bluetooth/hci_ipc")
@@ -105,7 +101,7 @@ if (CONFIG_NCS_INCLUDE_RPMSG_CHILD_IMAGE OR CONFIG_NCS_SAMPLE_EMPTY_NET_CORE_CHI
105101
if (CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU_SPEEDUP)
106102
# By passing this value we don't require the user to pass any overlay files to the
107103
# network core child image. Bluetooth buffer sizes are aligned automatically.
108-
if (CONFIG_NCS_SAMPLE_HCI_IPC_CHILD_IMAGE OR CONFIG_NCS_SAMPLE_MULTIPROTOCOL_RPMSG_CHILD_IMAGE)
104+
if (CONFIG_NCS_SAMPLE_HCI_IPC_CHILD_IMAGE)
109105
add_overlay_config(
110106
${CHILD_IMAGE_NAME}
111107
${CMAKE_CURRENT_LIST_DIR}/common/mcumgr_bt_ota_dfu/rpmsg_child_image_overlay.conf

0 commit comments

Comments
 (0)