From c3d3b3dbc8f49358b471c65dd5bf5e44de359c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Bol=C3=ADvar?= Date: Wed, 17 Mar 2021 14:48:09 -0700 Subject: [PATCH] Bluetooth: remove CONFIG_BT_CTLR_TO_HOST_UART_DEV_NAME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is now unused. Signed-off-by: Martí Bolívar --- doc/reference/devicetree/api.rst | 18 +++++++++--------- doc/releases/release-notes-2.6.rst | 4 ++++ subsys/bluetooth/Kconfig | 13 ------------- 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/doc/reference/devicetree/api.rst b/doc/reference/devicetree/api.rst index a9cb26e85e5..2ec2c3f098b 100644 --- a/doc/reference/devicetree/api.rst +++ b/doc/reference/devicetree/api.rst @@ -299,20 +299,19 @@ identifier for a chosen node. :project: Zephyr There are also conveniences for commonly used zephyr-specific properties of the -``/chosen`` node. (These may also be set in :file:`dts_fixup.h` files for now, -though this mechanism is deprecated.) +``/chosen`` node. .. doxygengroup:: devicetree-zephyr :project: Zephyr The following table documents some commonly used Zephyr-specific chosen nodes. -Often, a chosen node's label property will be used to set the default value of -a Kconfig option which in turn configures a hardware-specific subsystem -setting. This is usually for backwards compatibility in cases when the Kconfig -option predates devicetree support in Zephyr. In other cases, there is no -Kconfig option, and the devicetree node's label property is used directly in -the source code to specify a device name. +Sometimes, a chosen node's label property will be used to set the default value +of a Kconfig option which in turn configures a hardware-specific device. This +is usually for backwards compatibility in cases when the Kconfig option +predates devicetree support in Zephyr. In other cases, there is no Kconfig +option, and the devicetree node is used directly in the source code to select a +device. .. Documentation maintainers: please keep this sorted by property name @@ -322,7 +321,8 @@ the source code to specify a device name. * - Property - Purpose * - zephyr,bt-c2h-uart - - Sets default :option:`CONFIG_BT_CTLR_TO_HOST_UART_DEV_NAME` + - Selects the UART used for host communication in the + :ref:`bluetooth-hci-uart-sample` * - zephyr,bt-mon-uart - Sets default :option:`CONFIG_BT_MONITOR_ON_DEV_NAME` * - zephyr,bt-uart diff --git a/doc/releases/release-notes-2.6.rst b/doc/releases/release-notes-2.6.rst index 5c076571444..2783bf439da 100644 --- a/doc/releases/release-notes-2.6.rst +++ b/doc/releases/release-notes-2.6.rst @@ -156,6 +156,10 @@ Drivers and Sensors * Bluetooth + * The Kconfig option ``CONFIG_BT_CTLR_TO_HOST_UART_DEV_NAME`` was removed. + Use the :ref:`zephyr,bt-c2h-uart chosen node ` + directly instead. + * CAN * Clock Control diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig index 88c1d335500..a8caf984238 100644 --- a/subsys/bluetooth/Kconfig +++ b/subsys/bluetooth/Kconfig @@ -302,19 +302,6 @@ config BT_ISO_MAX_BIG endif # BT_ISO_BROADCAST endif # BT_ISO -# Workaround for not being able to have commas in macro arguments -DT_CHOSEN_Z_BT_C2H_UART := zephyr,bt-c2h-uart - -config BT_CTLR_TO_HOST_UART_DEV_NAME - string "Device Name of UART Device to an external Bluetooth Host" - default "$(dt_chosen_label,$(DT_CHOSEN_Z_BT_C2H_UART))" if HAS_DTS - default "UART_0" - depends on BT_HCI_RAW - help - This option specifies the name of UART device to be used - to connect to an external Bluetooth Host when Zephyr is - acting as a Bluetooth Controller. - source "subsys/bluetooth/common/Kconfig" source "subsys/bluetooth/host/Kconfig" source "subsys/bluetooth/controller/Kconfig"