Skip to content

Commit 618d441

Browse files
rettichschnididkalowsk
authored andcommitted
bluetooth: Remove migration hints
Zephyr 3.7.0 has been released and it is time to remove the migration code added in 9cf07bb (bluetooth: Rename rpmsg HCI driver and sample to ipc). Signed-off-by: Reto Schneider <[email protected]>
1 parent 25272ae commit 618d441

File tree

3 files changed

+0
-26
lines changed

3 files changed

+0
-26
lines changed

drivers/bluetooth/hci/CMakeLists.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3-
# Remove after 3.7.0 is released
4-
if(CONFIG_BT_RPMSG)
5-
message(FATAL_ERROR "CONFIG_BT_RPMSG has been renamed to CONFIG_BT_HCI_IPC")
6-
endif()
7-
8-
# Remove after 3.7.0 is released
9-
if(CONFIG_BT_HCI_IPC)
10-
dt_chosen(chosen_hci_rpmsg PROPERTY "zephyr,bt-hci-rpmsg-ipc")
11-
if(DEFINED chosen_hci_rpmsg)
12-
message(FATAL_ERROR "zephyr,bt-hci-rpmsg-ipc has been renamed to zephyr,bt-hci-ipc")
13-
endif()
14-
endif()
15-
163
zephyr_library_sources_ifdef(CONFIG_BT_ESP32 hci_esp32.c)
174
if(CONFIG_DT_HAS_ESPRESSIF_ESP32_BT_HCI_ENABLED)
185
zephyr_blobs_verify(MODULE hal_espressif REQUIRED)

drivers/bluetooth/hci/Kconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,6 @@ config BT_H5
2929
Bluetooth three-wire (H:5) UART driver. Implementation of HCI
3030
Three-Wire UART Transport Layer.
3131

32-
# Removed: Here only to give the user a warning about its removal
33-
# Remove after 3.7.0 is released
34-
config BT_RPMSG
35-
bool
36-
help
37-
Use BT_HCI_IPC instead
38-
3932
config BT_HCI_IPC
4033
bool
4134
default y

samples/bluetooth/hci_ipc/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,3 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
66
project(hci_ipc)
77

88
target_sources(app PRIVATE src/main.c)
9-
10-
# Remove after 3.7.0 is released
11-
dt_chosen(chosen_hci_rpmsg PROPERTY "zephyr,bt-hci-rpmsg-ipc")
12-
if(DEFINED chosen_hci_rpmsg)
13-
message(FATAL_ERROR "zephyr,bt-hci-rpmsg-ipc has been renamed to zephyr,bt-hci-ipc")
14-
endif()

0 commit comments

Comments
 (0)