treewide: Replace hci_rpmsg with hci_ipc

Updates the hci_rpmsg application name with hci_ipc, which was updated in zephyr Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
nrfconnect · Jan 10, 2024 · 0534088 · 0534088
1 parent 43a5a4a
commit 0534088
Show file tree

Hide file tree

Showing 157 changed files with 381 additions and 365 deletions.
diff --git a/applications/machine_learning/CMakeLists.txt b/applications/machine_learning/CMakeLists.txt
@@ -39,6 +39,6 @@ add_subdirectory(src/events)
 add_subdirectory(src/modules)
 add_subdirectory(src/util)
 
-if(CONFIG_BT_RPMSG)
-  assert_exists(hci_rpmsg_CONF_FILE)
+if(CONFIG_BT_HCI_IPC)
+  assert_exists(hci_ipc_CONF_FILE)
 endif()
diff --git a/applications/machine_learning/README.rst b/applications/machine_learning/README.rst
@@ -312,7 +312,7 @@ The Thingy:53 and nRF53 Development Kit use multi-image build with the following
 
 You can define the application-specific configuration for the mentioned child images in the board-specific directory in the :file:`applications/machine_learning/configuration/` directory.
 The Kconfig configuration file should be located in subdirectory :file:`child_image/child_image_name` and its name should match the application Kconfig file name, that is contain the build type if necessary
-For example, the :file:`applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/child_image/hci_rpmsg/prj.conf` file defines configuration of Bluetooth HCI RPMsg for ``debug`` build type on ``thingy53_nrf5340_cpuapp`` board, while the :file:`applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/child_image/hci_rpmsg/prj_release.conf` file defines configuration of Bluetooth HCI RPMsg for ``release`` build type.
+For example, the :file:`applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/child_image/hci_ipc/prj.conf` file defines configuration of Bluetooth HCI RPMsg for ``debug`` build type on ``thingy53_nrf5340_cpuapp`` board, while the :file:`applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/child_image/hci_ipc/prj_release.conf` file defines configuration of Bluetooth HCI RPMsg for ``release`` build type.
 See :ref:`ug_multi_image` for detailed information about multi-image builds and child image configuration.
 
 .. _nrf_machine_learning_app_requirements_build_types:

diff --git a/...340_cpuapp/child_image/hci_rpmsg/prj.conf → ...f5340_cpuapp/child_image/hci_ipc/prj.conf b/...340_cpuapp/child_image/hci_rpmsg/prj.conf → ...f5340_cpuapp/child_image/hci_ipc/prj.conf
diff --git a/...340_cpuapp/child_image/hci_rpmsg/prj.conf → ...f5340_cpuapp/child_image/hci_ipc/prj.conf b/...340_cpuapp/child_image/hci_rpmsg/prj.conf → ...f5340_cpuapp/child_image/hci_ipc/prj.conf
diff --git a/...pp/child_image/hci_rpmsg/prj_release.conf → ...uapp/child_image/hci_ipc/prj_release.conf b/...pp/child_image/hci_rpmsg/prj_release.conf → ...uapp/child_image/hci_ipc/prj_release.conf
diff --git a/...cpuapp/child_image/hci_rpmsg/prj_rtt.conf → ...0_cpuapp/child_image/hci_ipc/prj_rtt.conf b/...cpuapp/child_image/hci_rpmsg/prj_rtt.conf → ...0_cpuapp/child_image/hci_ipc/prj_rtt.conf
diff --git a/..._cpuapp_ns/child_image/hci_rpmsg/prj.conf → ...40_cpuapp_ns/child_image/hci_ipc/prj.conf b/..._cpuapp_ns/child_image/hci_rpmsg/prj.conf → ...40_cpuapp_ns/child_image/hci_ipc/prj.conf
diff --git a/...ns/child_image/hci_rpmsg/prj_release.conf → ...p_ns/child_image/hci_ipc/prj_release.conf b/...ns/child_image/hci_rpmsg/prj_release.conf → ...p_ns/child_image/hci_ipc/prj_release.conf
diff --git a/...app_ns/child_image/hci_rpmsg/prj_rtt.conf → ...puapp_ns/child_image/hci_ipc/prj_rtt.conf b/...app_ns/child_image/hci_rpmsg/prj_rtt.conf → ...puapp_ns/child_image/hci_ipc/prj_rtt.conf
diff --git a/applications/matter_bridge/CMakeLists.txt b/applications/matter_bridge/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.20.0)
 
 # Set Kconfig root files that will be processed as a first Kconfig for used child images.
 set(mcuboot_KCONFIG_ROOT "\\\${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.mcuboot.root")
-set(hci_rpmsg_KCONFIG_ROOT "\\\${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.hci_rpmsg.root")
+set(hci_ipc_KCONFIG_ROOT "\\\${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.hci_ipc.root")
 
 # For prj.conf the CONF_FILE is empty. In other case extract the exact file name from the path string.
 if(CONF_FILE)

diff --git a/applications/matter_bridge/child_image/hci_ipc/prj.conf b/applications/matter_bridge/child_image/hci_ipc/prj.conf
@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2023 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# This target uses Kconfig.hci_ipc.defaults to set options common for all
+# samples using hci_ipc. This file should contain only options specific for this sample
+# hci_ipc configuration or overrides of default values.
+
+# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding
+# in board files.
+
+CONFIG_SERIAL=n
+CONFIG_UART_CONSOLE=n
+CONFIG_RESET_ON_FATAL_ERROR=n
+
+CONFIG_BT_MAX_CONN=10
+CONFIG_BT_CENTRAL=y
diff --git a/applications/matter_bridge/child_image/hci_ipc/prj_release.conf b/applications/matter_bridge/child_image/hci_ipc/prj_release.conf
@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2023 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# This target uses Kconfig.hci_ipc.defaults to set options common for all
+# samples using hci_ipc. This file should contain only options specific for this sample
+# hci_ipc configuration or overrides of default values.
+
+# Disable not used modules that cannot be set in Kconfig.hci_ipc.defaults due to overriding
+# in board files.
+
+CONFIG_SERIAL=n
+CONFIG_UART_CONSOLE=n
+CONFIG_RESET_ON_FATAL_ERROR=y
+
+CONFIG_BT_MAX_CONN=10
+CONFIG_BT_CENTRAL=y
diff --git a/applications/matter_bridge/child_image/hci_rpmsg/prj.conf b/applications/matter_bridge/child_image/hci_rpmsg/prj.conf
diff --git a/applications/matter_bridge/child_image/hci_rpmsg/prj_release.conf b/applications/matter_bridge/child_image/hci_rpmsg/prj_release.conf
diff --git a/applications/matter_bridge/doc/matter_bridge_description.rst b/applications/matter_bridge/doc/matter_bridge_description.rst
@@ -349,7 +349,7 @@ Build the target using the following command in the project directory to enable
 .. parsed-literal::
    :class: highlight
 
-   west build -b nrf7002dk_nrf5340_cpuapp -- -DCONFIG_BRIDGED_DEVICE_BT=y -DOVERLAY_CONFIG="overlay-bt_max_connections_app.conf" -Dhci_rpmsg_OVERLAY_CONFIG="*absoule_path*/overlay-bt_max_connections_net.conf"
+   west build -b nrf7002dk_nrf5340_cpuapp -- -DCONFIG_BRIDGED_DEVICE_BT=y -DOVERLAY_CONFIG="overlay-bt_max_connections_app.conf" -Dhci_ipc_OVERLAY_CONFIG="*absoule_path*/overlay-bt_max_connections_net.conf"
 
 Replace *absolute_path* with the absolute path to the Matter bridge application on your local disk.
 

diff --git a/applications/matter_weather_station/CMakeLists.txt b/applications/matter_weather_station/CMakeLists.txt
@@ -12,7 +12,7 @@ cmake_minimum_required(VERSION 3.20.0)
 set(APPLICATION_CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/configuration/\${BOARD}")
 
 set(multiprotocol_rpmsg_KCONFIG_ROOT "\\\${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.root")
-set(hci_rpmsg_KCONFIG_ROOT "\\\${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.hci_rpmsg.root")
+set(hci_ipc_KCONFIG_ROOT "\\\${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.hci_ipc.root")
 
 if("${OVERLAY_CONFIG}" STREQUAL "overlay-factory_data.conf")
     set(PM_STATIC_YML_FILE ${APPLICATION_CONFIG_DIR}/pm_static_factory_data.yml)

diff --git a/...340_cpuapp/child_image/hci_rpmsg/prj.conf → ...f5340_cpuapp/child_image/hci_ipc/prj.conf b/...340_cpuapp/child_image/hci_rpmsg/prj.conf → ...f5340_cpuapp/child_image/hci_ipc/prj.conf
diff --git a/...pp/child_image/hci_rpmsg/prj_release.conf → ...uapp/child_image/hci_ipc/prj_release.conf b/...pp/child_image/hci_rpmsg/prj_release.conf → ...uapp/child_image/hci_ipc/prj_release.conf
diff --git a/applications/nrf5340_audio/README.rst b/applications/nrf5340_audio/README.rst
@@ -66,7 +66,7 @@ Only one of the following :file:`.conf` files is included when building:
   When building using the command line, you must explicitly specify if :file:`prj_release.conf` is going to be included instead of :file:`prj.conf`.
   See :ref:`nrf53_audio_app_building` for details.
 
-In addition, the application features the :file:`child_image` directory with an experimental :file:`hci_rpmsg.conf`.
+In addition, the application features the :file:`child_image` directory with an experimental :file:`hci_ipc.conf`.
 This file is a work-in-progress implementation of the SoftDevice Controller that has not been thoroughly tested and should not be used.
 The application is only tested using :ref:`lib_bt_ll_acs_nrf53_readme`.
 

diff --git a/.../nrf5340_audio/child_image/hci_rpmsg.conf → ...ns/nrf5340_audio/child_image/hci_ipc.conf b/.../nrf5340_audio/child_image/hci_rpmsg.conf → ...ns/nrf5340_audio/child_image/hci_ipc.conf
diff --git a/applications/nrf5340_audio/tools/buildprog/buildprog.py b/applications/nrf5340_audio/tools/buildprog/buildprog.py
@@ -202,7 +202,7 @@ def __populate_hex_paths(dev, options, child_image):
 
     if options.controller != Controller.acs_nrf53:
         dev.hex_path_app = dest_folder / "zephyr/zephyr.hex"
-        dev.hex_path_net = dest_folder / "hci_rpmsg/zephyr/zephyr.hex"
+        dev.hex_path_net = dest_folder / "hci_ipc/zephyr/zephyr.hex"
         return
 
     if dev.core_app_programmed == SelectFlags.TBD:

diff --git a/applications/nrf_desktop/CMakeLists.txt b/applications/nrf_desktop/CMakeLists.txt
@@ -50,8 +50,8 @@ if(NOT SYSBUILD AND NOT CONFIG_NCS_IS_VARIANT_IMAGE)
   if(CONFIG_SECURE_BOOT)
     assert_exists(b0_CONF_FILE)
   endif()
-  if(CONFIG_BT_RPMSG)
-    assert_exists(hci_rpmsg_CONF_FILE)
+  if(CONFIG_BT_HCI_IPC)
+    assert_exists(hci_ipc_CONF_FILE)
   endif()
 endif()
 

diff --git a/applications/nrf_desktop/README.rst b/applications/nrf_desktop/README.rst
@@ -873,12 +873,12 @@ For example, you can build the application for ``nrf52840dk_nrf52840`` with ``nr
 
 For the multi-core build, you need to pass the ``SHIELD`` parameter to images built on both application and network core.
 The network core controls the FEM, but the application core needs to forward the needed pins to the network core.
-Use ``hci_rpmsg_`` as the *childImageName* parameter, because in the nRF Desktop application, network core runs using ``hci_rpmsg_``.
+Use ``hci_ipc_`` as the *childImageName* parameter, because in the nRF Desktop application, network core runs using ``hci_ipc_``.
 The command for ``nrf5340dk_nrf5340_cpuapp`` with ``nrf21540ek`` shield would look as follows:
 
 .. code-block:: console
 
-   west build -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf21540ek_fwd -Dhci_rpmsg_SHIELD=nrf21540ek -DCONFIG_CAF_BLE_USE_LLPM=n
+   west build -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf21540ek_fwd -Dhci_ipc_SHIELD=nrf21540ek -DCONFIG_CAF_BLE_USE_LLPM=n
 
 For detailed information about building an application using the nRF21540 EK, see the :ref:`ug_radio_fem_nrf21540ek_programming` section in the Working with RF Front-end modules documentation.
 

diff --git a/...340_cpuapp/child_image/hci_rpmsg/prj.conf → ...f5340_cpuapp/child_image/hci_ipc/prj.conf b/...340_cpuapp/child_image/hci_rpmsg/prj.conf → ...f5340_cpuapp/child_image/hci_ipc/prj.conf
diff --git a/...pp/child_image/hci_rpmsg/prj_release.conf → ...uapp/child_image/hci_ipc/prj_release.conf b/...pp/child_image/hci_rpmsg/prj_release.conf → ...uapp/child_image/hci_ipc/prj_release.conf
diff --git a/applications/nrf_desktop/sample.yaml b/applications/nrf_desktop/sample.yaml
@@ -112,7 +112,7 @@ tests:
       - nrf5340dk_nrf5340_cpuapp
     tags: bluetooth ci_build
     extra_args: SHIELD=nrf21540ek_fwd
-                hci_rpmsg_SHIELD=nrf21540ek
+                hci_ipc_SHIELD=nrf21540ek
     extra_configs:
       - CONFIG_CAF_BLE_USE_LLPM=n
   applications.nrf_desktop.zrelease:

diff --git a/...s/nrf_desktop/sysbuild/hci_rpmsg/prj.conf → ...ons/nrf_desktop/sysbuild/hci_ipc/prj.conf b/...s/nrf_desktop/sysbuild/hci_rpmsg/prj.conf → ...ons/nrf_desktop/sysbuild/hci_ipc/prj.conf
diff --git a/boards/arm/nrf7002dk_nrf5340/Kconfig b/boards/arm/nrf7002dk_nrf5340/Kconfig
@@ -27,11 +27,11 @@ config BOARD_ENABLE_DCDC_HV
 	default y
 
 choice BT_HCI_BUS_TYPE
-	default BT_RPMSG if BT
+	default BT_HCI_IPC if BT
 endchoice
 
 config HEAP_MEM_POOL_SIZE
-	default 4096 if BT_RPMSG
+	default 4096 if BT_HCI_IPC
 
 config BT_HCI_VS
 	default y if BT
@@ -59,7 +59,7 @@ config DOMAIN_CPUNET_BOARD
 	help
 	  The board which will be used for CPUNET domain when creating a multi
 	  image application where one or more images should be located on
-	  another board. For example hci_rpmsg on the nRF5340_cpunet for
+	  another board. For example hci_ipc on the nRF5340_cpunet for
 	  Bluetooth applications.
 
 endif #  BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NS

diff --git a/boards/arm/nrf7002dk_nrf5340/nrf5340_cpuapp_common.dts b/boards/arm/nrf7002dk_nrf5340/nrf5340_cpuapp_common.dts
@@ -13,7 +13,7 @@
 		zephyr,uart-mcumgr = &uart0;
 		zephyr,bt-mon-uart = &uart0;
 		zephyr,bt-c2h-uart = &uart0;
-		zephyr,bt-hci-rpmsg-ipc = &ipc0;
+		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,ieee802154 = &ieee802154;
 	};

diff --git a/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpunet.dts b/boards/arm/nrf7002dk_nrf5340/nrf7002dk_nrf5340_cpunet.dts
@@ -18,7 +18,7 @@
 		zephyr,uart-mcumgr = &uart0;
 		zephyr,bt-mon-uart = &uart0;
 		zephyr,bt-c2h-uart = &uart0;
-		zephyr,bt-hci-rpmsg-ipc = &ipc0;
+		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,sram = &sram1;
 		zephyr,flash = &flash1;

diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/Kconfig b/boards/arm/nrf7002dk_nrf7001_nrf5340/Kconfig
@@ -25,11 +25,11 @@ config BOARD_ENABLE_DCDC_HV
 	default y
 
 choice BT_HCI_BUS_TYPE
-	default BT_RPMSG if BT
+	default BT_HCI_IPC if BT
 endchoice
 
 config HEAP_MEM_POOL_SIZE
-	default 4096 if BT_RPMSG
+	default 4096 if BT_HCI_IPC
 
 config BT_HCI_VS
 	default y if BT
@@ -57,7 +57,7 @@ config DOMAIN_CPUNET_BOARD
 	help
 	  The board which will be used for CPUNET domain when creating a multi
 	  image application where one or more images should be located on
-	  another board. For example hci_rpmsg on the nRF5340_cpunet for
+	  another board. For example hci_ipc on the nRF5340_cpunet for
 	  Bluetooth applications.
 
 endif #  BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP_NS

diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf5340_cpuapp_common.dts b/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf5340_cpuapp_common.dts
@@ -13,7 +13,7 @@
 		zephyr,uart-mcumgr = &uart0;
 		zephyr,bt-mon-uart = &uart0;
 		zephyr,bt-c2h-uart = &uart0;
-		zephyr,bt-hci-rpmsg-ipc = &ipc0;
+		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,ieee802154 = &ieee802154;
 	};

diff --git a/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpunet.dts b/boards/arm/nrf7002dk_nrf7001_nrf5340/nrf7002dk_nrf7001_nrf5340_cpunet.dts
@@ -18,7 +18,7 @@
 		zephyr,uart-mcumgr = &uart0;
 		zephyr,bt-mon-uart = &uart0;
 		zephyr,bt-c2h-uart = &uart0;
-		zephyr,bt-hci-rpmsg-ipc = &ipc0;
+		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,sram = &sram1;
 		zephyr,flash = &flash1;

diff --git a/doc/nrf/config_and_build/multi_image.rst b/doc/nrf/config_and_build/multi_image.rst
@@ -121,8 +121,8 @@ See the following example:
 .. code-block:: cmake
 
    add_child_image(
-      NAME hci_rpmsg
-      SOURCE_DIR ${ZEPHYR_BASE}/samples/bluetooth/hci_rpmsg
+      NAME hci_ipc
+      SOURCE_DIR ${ZEPHYR_BASE}/samples/bluetooth/hci_ipc
       DOMAIN CPUNET
       )
 

diff --git a/doc/nrf/device_guides/wifi_coex.rst b/doc/nrf/device_guides/wifi_coex.rst
@@ -157,7 +157,7 @@ To enable Wi-Fi coexistence on the nRF70 Series device, complete the following s
 
    *  ``multiprotocol_rpmsg`` for multiprotocol applications having support for both 802.15.4 and Bluetooth.
    *  ``802154_rpmsg`` for applications having support for 802.15.4, but not for Bluetooth.
-   *  ``hci_rpmsg`` for application having support for Bluetooth, but not for 802.15.4.
+   *  ``hci_ipc`` for application having support for Bluetooth, but not for 802.15.4.
 
 #. Enable the following Kconfig options:
 
@@ -235,7 +235,7 @@ To enable the generic three-wire coexistence, do the following:
 
    * ``multiprotocol_rpmsg`` for multiprotocol applications having support for both 802.15.4 and Bluetooth.
    * ``802154_rpmsg`` for applications having support for 802.15.4, but not for Bluetooth.
-   * ``hci_rpmsg`` for application having support for Bluetooth, but not for 802.15.4.
+   * ``hci_ipc`` for application having support for Bluetooth, but not for 802.15.4.
 
 #. Enable the following Kconfig options:
 

diff --git a/doc/nrf/device_guides/working_with_fem.rst b/doc/nrf/device_guides/working_with_fem.rst
@@ -304,7 +304,7 @@ To use nRF21540 in GPIO mode, complete the following steps:
 
    *  ``multiprotocol_rpmsg`` for multiprotocol applications having support for both 802.15.4 and Bluetooth.
    *  ``802154_rpmsg`` for applications having support for 802.15.4, but not for Bluetooth.
-   *  ``hci_rpmsg`` for application having support for Bluetooth, but not for 802.15.4.
+   *  ``hci_ipc`` for application having support for Bluetooth, but not for 802.15.4.
 
    .. note::
        This step is not needed when testing with :ref:`direct_test_mode` and :ref:`radio_test` on the nRF53 Series devices.
@@ -635,7 +635,7 @@ The *childImageName_* parameter can take the following values:
 
 *  ``multiprotocol_rpmsg_`` for multiprotocol applications with support for 802.15.4 and Bluetooth
 *  ``802154_rpmsg_`` for applications with support for 802.15.4, but without support for Bluetooth
-*  ``hci_rpmsg_`` for application with support for Bluetooth, but without support for 802.15.4
+*  ``hci_ipc_`` for application with support for Bluetooth, but without support for 802.15.4
 
 References
 ^^^^^^^^^^

diff --git a/doc/nrf/device_guides/working_with_nrf/nrf53/nrf5340.rst b/doc/nrf/device_guides/working_with_nrf/nrf53/nrf5340.rst
@@ -341,7 +341,7 @@ For other samples, the images are built separately.
 
 The :term:`build configuration` depends on the following Kconfig options that must be set in the configuration of the parent image:
 
-* :kconfig:option:`CONFIG_BT_RPMSG` - set to ``y`` in all Bluetooth LE samples for the application core
+* :kconfig:option:`CONFIG_BT_HCI_IPC` - set to ``y`` in all Bluetooth LE samples for the application core
 * :kconfig:option:`CONFIG_NRF_802154_SER_HOST` - set to ``y`` in all Thread, Zigbee, and Matter samples for the application core
 * :kconfig:option:`CONFIG_NCS_SAMPLE_EMPTY_APP_CORE_CHILD_IMAGE` - set to ``y`` in all network core samples that require the :ref:`nrf5340_empty_app_core` sample
 
@@ -353,13 +353,13 @@ The combination of these options determines which (if any) sample is included in
    * - Enabled options
      - Child image sample for the network core
      - Child image sample for the application core
-   * - :kconfig:option:`CONFIG_BT_RPMSG`
+   * - :kconfig:option:`CONFIG_BT_HCI_IPC`
      - :ref:`zephyr:bluetooth-hci-rpmsg-sample`
      - ---
    * - :kconfig:option:`CONFIG_NRF_802154_SER_HOST`
      - :ref:`zephyr:nrf-ieee802154-rpmsg-sample`
      - ---
-   * - :kconfig:option:`CONFIG_BT_RPMSG` and :kconfig:option:`CONFIG_NRF_802154_SER_HOST`
+   * - :kconfig:option:`CONFIG_BT_HCI_IPC` and :kconfig:option:`CONFIG_NRF_802154_SER_HOST`
      - :ref:`multiprotocol-rpmsg-sample`
      - ---
    * - :kconfig:option:`CONFIG_NCS_SAMPLE_EMPTY_APP_CORE_CHILD_IMAGE`
@@ -370,13 +370,13 @@ Configuration of the child image
 ================================
 
 When a network sample is built automatically as a child image in a multi-image build, you can define the relevant Kconfig options (if required) in a :file:`.conf` file.
-Name the file :file:`network_sample*\ .conf`, where *network_sample* is the name of the child image (for example, :file:`hci_rpmsg.conf`).
+Name the file :file:`network_sample*\ .conf`, where *network_sample* is the name of the child image (for example, :file:`hci_ipc.conf`).
 Place the file in a :file:`child_image` subfolder of the application sample directory.
 See :ref:`ug_multi_image_variables` for more information.
 
 This way of defining the Kconfig options allows to align the configurations of both images.
 
-For example, see the :ref:`ble_throughput` child image configuration in :file:`nrf/samples/bluetooth/throughput/child_image/hci_rpmsg.conf`.
+For example, see the :ref:`ble_throughput` child image configuration in :file:`nrf/samples/bluetooth/throughput/child_image/hci_ipc.conf`.
 
 .. _ug_nrf5340_building:
 

diff --git a/doc/nrf/protocols/matter/getting_started/hw_requirements.rst b/doc/nrf/protocols/matter/getting_started/hw_requirements.rst
@@ -488,7 +488,7 @@ For more information about configuration of memory layouts in Matter, see :ref:`
         |                                                         |                     |                   +---------------------+------------------+-------------------+
         |                                                         |                     |                   | provision           | 33.375kB (0x8580)| 640B (0x280)      |
         +---------------------------------------------------------+---------------------+-------------------+---------------------+------------------+-------------------+
-        | Network application (app)                               | 34kB (0x8800)       | 222kB (0x37800)   | hci_rpmsg           | 34kB (0x8800)    | 222kB (0x37800)   |
+        | Network application (app)                               | 34kB (0x8800)       | 222kB (0x37800)   | hci_ipc           | 34kB (0x8800)    | 222kB (0x37800)   |
         +---------------------------------------------------------+---------------------+-------------------+---------------------+------------------+-------------------+
 
       Network core SRAM flash (size: 0x10000 = 64kB)

diff --git a/doc/nrf/protocols/matter/getting_started/kconfig.rst b/doc/nrf/protocols/matter/getting_started/kconfig.rst
@@ -18,7 +18,7 @@ The Kconfig options for Matter applications in the |NCS| are stored in the follo
 * :file:`prj.conf` files, which are specific to the application.
 * :file:`Kconfig.defaults` file, which is available in the :file:`module/lib/matter/config/nrfconnect/chip-module` directory and is used to populate :file:`prj.conf` with Kconfig option settings common to all samples.
 
-The Matter samples use the same structure for other software images, such as MCUboot, Multiprotocol RPMsg or HCI RPMsg, which have default options defined in the corresponding :file:`Kconfig.mcuboot.defaults`, :file:`Kconfig.multiprotocol_rpmsg.defaults` and :file:`Kconfig.hci_rpmsg.defaults` files.
+The Matter samples use the same structure for other software images, such as MCUboot, Multiprotocol RPMsg or HCI RPMsg, which have default options defined in the corresponding :file:`Kconfig.mcuboot.defaults`, :file:`Kconfig.multiprotocol_rpmsg.defaults` and :file:`Kconfig.hci_ipc.defaults` files.
 
 For an example configuration, see the :ref:`Matter Template sample's <matter_template_sample>` :file:`prj.conf` files in the sample root directory.
 

diff --git a/doc/nrf/protocols/matter/getting_started/transmission_power.rst b/doc/nrf/protocols/matter/getting_started/transmission_power.rst
@@ -146,7 +146,7 @@ You can do this by either editing the :file:`prj.conf` file or building the samp
       For example:
 
       * If you want to build for Thread devices for the ``nrf5340dk_nrf5340_cpuapp`` build 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.
-      * If you want to build for Wi-Fi® devices for the ``nrf7002dk_nrf5340_cpuapp`` build target with a Bluetooth LE TX power equal to 3 dBm, add ``-Dhci_rpmsg_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y`` as the CMake argument.
+      * If you want to build for Wi-Fi® devices for the ``nrf7002dk_nrf5340_cpuapp`` build 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.
 
       See `nRF Connect for VS Code extension pack <How to work with build configurations_>`_ documentation for more information.
 
@@ -167,7 +167,7 @@ You can do this by either editing the :file:`prj.conf` file or building the samp
 
         .. code-block:: console
 
-           west build -b nrf7002dk_nrf5340_cpuapp -- -Dhci_rpmsg_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y
+           west build -b nrf7002dk_nrf5340_cpuapp -- -Dhci_ipc_CONFIG_BT_CTLR_TX_PWR_PLUS_3=y
 
 ..