Skip to content

Bluetooth: Controller: Remove deprecated BT_CTLR Kconfig option #94287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boards/ezurio/bl54l15_dvk/Kconfig.defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ endif # BOARD_BL54L15_DVK_NRF54L10_CPUAPP || BOARD_BL54L15_DVK_NRF54L15_CPUAPP

if BOARD_BL54L15_DVK_NRF54L10_CPUAPP_NS || BOARD_BL54L15_DVK_NRF54L15_CPUAPP_NS

config BT_CTLR
config HAS_BT_CTLR
default BT

config FLASH_LOAD_OFFSET
Expand Down
2 changes: 1 addition & 1 deletion boards/ezurio/bl54l15u_dvk/Kconfig.defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ endif # BOARD_BL54L15U_DVK_NRF54L15_CPUAPP

if BOARD_BL54L15U_DVK_NRF54L15_CPUAPP_NS

config BT_CTLR
config HAS_BT_CTLR
default BT

config FLASH_LOAD_OFFSET
Expand Down
2 changes: 1 addition & 1 deletion boards/nordic/nrf54l15dk/Kconfig.defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ config BOARD_NRF54L15DK
select USE_DT_CODE_PARTITION if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS || \
BOARD_NRF54L15DK_NRF54L10_CPUAPP_NS

config BT_CTLR
config HAS_BT_CTLR
default BT

# By default, if we build for a Non-Secure version of the board,
Expand Down
2 changes: 1 addition & 1 deletion boards/panasonic/panb511evb/Kconfig.defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ endif # BOARD_PANB511EVB_NRF54L15_CPUAPP

if BOARD_PANB511EVB_NRF54L15_CPUAPP_NS

config BT_CTLR
config HAS_BT_CTLR
default BT

config FLASH_LOAD_OFFSET
Expand Down
2 changes: 1 addition & 1 deletion boards/raytac/an54l15q_db/Kconfig.defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ endif # BOARD_RAYTAC_AN54L15Q_DB_NRF54L15_CPUAPP

if BOARD_RAYTAC_AN54L15Q_DB_NRF54L15_CPUAPP_NS

config BT_CTLR
config HAS_BT_CTLR
default BT

config FLASH_LOAD_OFFSET
Expand Down
2 changes: 1 addition & 1 deletion boards/seeed/xiao_nrf54l15/Kconfig.defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
if BOARD_XIAO_NRF54L15_NRF54L15_CPUAPP

config BT_CTLR
config HAS_BT_CTLR
default BT

config ROM_START_OFFSET
Expand Down
3 changes: 2 additions & 1 deletion samples/bluetooth/bap_broadcast_sink/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ config SCAN_OFFLOAD
bool "Whether to wait for a Broadcast Assistant"
default y
# enable PAST support if we can
select BT_PER_ADV_SYNC_TRANSFER_RECEIVER if !BT_CTLR || BT_CTLR_SYNC_TRANSFER_RECEIVER_SUPPORT
select BT_PER_ADV_SYNC_TRANSFER_RECEIVER if (!HAS_BT_CTLR || \
BT_CTLR_SYNC_TRANSFER_RECEIVER_SUPPORT)
help
If set to true, the sample will start advertising connectable for
Broadcast Assistants.
Expand Down
7 changes: 4 additions & 3 deletions samples/bluetooth/cap_acceptor/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ config SAMPLE_UNICAST
select BT_PAC_SNK_LOC
select BT_PAC_SRC
select BT_PAC_SRC_LOC
select BT_CTLR_PERIPHERAL_ISO if BT_CTLR
select BT_CTLR_PERIPHERAL_ISO if HAS_BT_CTLR
help
If set to true, the sample will start advertising connectable for
Broadcast Assistants.
Expand All @@ -27,8 +27,9 @@ config SAMPLE_BROADCAST
select BT_BAP_BROADCAST_SINK
select BT_PAC_SNK
select BT_PAC_SNK_LOC
select BT_PER_ADV_SYNC_TRANSFER_RECEIVER if !BT_CTLR || BT_CTLR_SYNC_TRANSFER_RECEIVER_SUPPORT
select BT_CTLR_SYNC_ISO if BT_CTLR
select BT_PER_ADV_SYNC_TRANSFER_RECEIVER if (!HAS_BT_CTLR || \
BT_CTLR_SYNC_TRANSFER_RECEIVER_SUPPORT)
select BT_CTLR_SYNC_ISO if HAS_BT_CTLR
help
If set to true, the sample will start advertising syncable audio streams

Expand Down
4 changes: 2 additions & 2 deletions samples/bluetooth/cap_initiator/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ config SAMPLE_UNICAST
select BT_KEYS_OVERWRITE_OLDEST
select BT_CSIP_SET_COORDINATOR
select BT_BAP_UNICAST_CLIENT
select BT_CTLR_CENTRAL_ISO if BT_CTLR
select BT_CTLR_CENTRAL_ISO if HAS_BT_CTLR
help
If set to true, the sample will start advertising connectable for
Broadcast Assistants.
Expand All @@ -26,7 +26,7 @@ config SAMPLE_BROADCAST
select BT_BROADCASTER
select BT_ISO_BROADCASTER
select BT_BAP_BROADCAST_SOURCE
select BT_CTLR_ADV_ISO if BT_CTLR
select BT_CTLR_ADV_ISO if HAS_BT_CTLR
help
If set to true, the sample will start advertising syncable audio streams

Expand Down
10 changes: 0 additions & 10 deletions subsys/bluetooth/controller/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -137,16 +137,6 @@ config BT_CTLR_EXTENDED_FEAT_SET_SUPPORT
config HAS_BT_CTLR
bool

config BT_CTLR
bool "Bluetooth Controller [DEPRECATED]"
select HAS_BT_CTLR
select DEPRECATED
help
Enables support for SoC native controller implementations. This option
has been deprecated and should not be used anymore. Instead, the
Kconfig options for specific Link Layer implementations should select
the HAS_BT_CTLR option.

config BT_LL_SW_SPLIT
bool "Software-based Bluetooth LE Link Layer"
default y
Expand Down
2 changes: 1 addition & 1 deletion tests/bluetooth/buf/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CONFIG_TEST=y
CONFIG_ZTEST=y

CONFIG_BT=y
CONFIG_BT_CTLR=n
CONFIG_BT_LL_SW_SPLIT=n
CONFIG_BT_H4=n

# Needed to enable and test the iso rx pool
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ manifest:
groups:
- crypto
- name: mcuboot
revision: 4e108f702b5322fb59344ae4976e3d73c973ef12
revision: bf5321bb6906e9e75b4c85b7c98b71c06ae52e90
path: bootloader/mcuboot
groups:
- bootloader
Expand Down