diff --git a/boards/96boards/carbon/Kconfig.defconfig b/boards/96boards/carbon/Kconfig.defconfig index 3fe660ff6d3..a680c5e19f8 100644 --- a/boards/96boards/carbon/Kconfig.defconfig +++ b/boards/96boards/carbon/Kconfig.defconfig @@ -13,7 +13,4 @@ endif # BOARD_96B_CARBON_STM32F401XE if BOARD_96B_CARBON_NRF51822 -config BT_CTLR - default BT - endif # BOARD_96B_CARBON_NRF51822 diff --git a/boards/96boards/nitrogen/Kconfig.defconfig b/boards/96boards/nitrogen/Kconfig.defconfig index c1686a82539..19571eb4ef4 100644 --- a/boards/96boards/nitrogen/Kconfig.defconfig +++ b/boards/96boards/nitrogen/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_96B_NITROGEN -config BT_CTLR - default BT - endif # BOARD_96B_NITROGEN diff --git a/boards/aconno/acn52832/Kconfig.defconfig b/boards/aconno/acn52832/Kconfig.defconfig index 10c5ce95ed8..57fd066809c 100644 --- a/boards/aconno/acn52832/Kconfig.defconfig +++ b/boards/aconno/acn52832/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_ACN52832 -config BT_CTLR - default BT - endif # BOARD_ACN52832 diff --git a/boards/adafruit/feather_nrf52840/Kconfig.defconfig b/boards/adafruit/feather_nrf52840/Kconfig.defconfig index 5e42fcfb8aa..bf56a00eebb 100644 --- a/boards/adafruit/feather_nrf52840/Kconfig.defconfig +++ b/boards/adafruit/feather_nrf52840/Kconfig.defconfig @@ -6,7 +6,4 @@ if BOARD_ADAFRUIT_FEATHER_NRF52840 -config BT_CTLR - default BT - endif # BOARD_ADAFRUIT_FEATHER_NRF52840 diff --git a/boards/adafruit/itsybitsy/Kconfig.defconfig b/boards/adafruit/itsybitsy/Kconfig.defconfig index b637497e148..7f71d774acf 100644 --- a/boards/adafruit/itsybitsy/Kconfig.defconfig +++ b/boards/adafruit/itsybitsy/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_ADAFRUIT_ITSYBITSY -config BT_CTLR - default BT - if BOARD_SERIAL_BACKEND_CDC_ACM config USB_DEVICE_STACK diff --git a/boards/adafruit/nrf52_adafruit_feather/Kconfig.defconfig b/boards/adafruit/nrf52_adafruit_feather/Kconfig.defconfig index 48cb9d7332d..b1259e40915 100644 --- a/boards/adafruit/nrf52_adafruit_feather/Kconfig.defconfig +++ b/boards/adafruit/nrf52_adafruit_feather/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF52_ADAFRUIT_FEATHER -config BT_CTLR - default BT - endif # BOARD_NRF52_ADAFRUIT_FEATHER diff --git a/boards/arduino/nano_33_ble/Kconfig.defconfig b/boards/arduino/nano_33_ble/Kconfig.defconfig index 73bd7e9c32d..f7803f7718a 100644 --- a/boards/arduino/nano_33_ble/Kconfig.defconfig +++ b/boards/arduino/nano_33_ble/Kconfig.defconfig @@ -3,9 +3,6 @@ if BOARD_ARDUINO_NANO_33_BLE -config BT_CTLR - default BT - config REGULATOR default y if SENSOR diff --git a/boards/arduino/nicla_sense_me/Kconfig.defconfig b/boards/arduino/nicla_sense_me/Kconfig.defconfig index b1e6a59d7d3..ff2238ca601 100644 --- a/boards/arduino/nicla_sense_me/Kconfig.defconfig +++ b/boards/arduino/nicla_sense_me/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_ARDUINO_NICLA_SENSE_ME -config BT_CTLR - default BT - endif # BOARD_ARDUINO_NICLA_SENSE_ME diff --git a/boards/bbc/microbit/Kconfig.defconfig b/boards/bbc/microbit/Kconfig.defconfig index 1f8bf5b8bc7..41fec971508 100644 --- a/boards/bbc/microbit/Kconfig.defconfig +++ b/boards/bbc/microbit/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_BBC_MICROBIT -config BT_CTLR - default BT - if FXOS8700 choice FXOS8700_MODE diff --git a/boards/bbc/microbit_v2/Kconfig.defconfig b/boards/bbc/microbit_v2/Kconfig.defconfig index 3139f2f24c5..c00278c3ced 100644 --- a/boards/bbc/microbit_v2/Kconfig.defconfig +++ b/boards/bbc/microbit_v2/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_BBC_MICROBIT_V2 -config BT_CTLR - default BT - endif # BOARD_BBC_MICROBIT_V2 diff --git a/boards/bcdevices/plt_demo_v2/Kconfig.defconfig b/boards/bcdevices/plt_demo_v2/Kconfig.defconfig index ce7c0c3891f..1ee0f255fcf 100644 --- a/boards/bcdevices/plt_demo_v2/Kconfig.defconfig +++ b/boards/bcdevices/plt_demo_v2/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_BLUECLOVER_PLT_DEMO_V2_NRF52832 -config BT_CTLR - default BT - config I2C default SENSOR diff --git a/boards/bytesatwork/bytesensi_l/Kconfig.defconfig b/boards/bytesatwork/bytesensi_l/Kconfig.defconfig index 52c2d397af8..45628d07f25 100644 --- a/boards/bytesatwork/bytesensi_l/Kconfig.defconfig +++ b/boards/bytesatwork/bytesensi_l/Kconfig.defconfig @@ -3,7 +3,4 @@ if BOARD_BYTESENSI_L -config BT_CTLR - default BT - endif # BOARD_BYTESENSI_L diff --git a/boards/contextualelectronics/abc/Kconfig.defconfig b/boards/contextualelectronics/abc/Kconfig.defconfig index 8568f02c34b..76745cd7b1f 100644 --- a/boards/contextualelectronics/abc/Kconfig.defconfig +++ b/boards/contextualelectronics/abc/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_CONTEXTUALELECTRONICS_ABC -config BT_CTLR - default BT - endif # BOARD_CONTEXTUALELECTRONICS_ABC diff --git a/boards/croxel/croxel_cx1825/Kconfig.defconfig b/boards/croxel/croxel_cx1825/Kconfig.defconfig index c96e14fea06..04fa79982b2 100644 --- a/boards/croxel/croxel_cx1825/Kconfig.defconfig +++ b/boards/croxel/croxel_cx1825/Kconfig.defconfig @@ -3,9 +3,6 @@ if BOARD_CROXEL_CX1825 -config BT_CTLR - default BT - if LOG # Logger cannot use itself to log diff --git a/boards/ct/ctcc/Kconfig.defconfig b/boards/ct/ctcc/Kconfig.defconfig index fb74f895a03..f7ec4884276 100644 --- a/boards/ct/ctcc/Kconfig.defconfig +++ b/boards/ct/ctcc/Kconfig.defconfig @@ -52,7 +52,4 @@ endif # USB_DEVICE_STACK endif # BOARD_SERIAL_BACKEND_CDC_ACM -config BT_CTLR - default BT - endif # BOARD_CTCC_NRF52840 diff --git a/boards/ebyte/e73_tbb/Kconfig.defconfig b/boards/ebyte/e73_tbb/Kconfig.defconfig index d3434e975a2..57d28a3f08c 100644 --- a/boards/ebyte/e73_tbb/Kconfig.defconfig +++ b/boards/ebyte/e73_tbb/Kconfig.defconfig @@ -6,7 +6,4 @@ if BOARD_EBYTE_E73_TBB_NRF52832 -config BT_CTLR - default BT - endif # BOARD_EBYTE_E73_TBB_NRF52832 diff --git a/boards/electronut/nrf52840_blip/Kconfig.defconfig b/boards/electronut/nrf52840_blip/Kconfig.defconfig index 91ff6042e0c..3d09e0f48e8 100644 --- a/boards/electronut/nrf52840_blip/Kconfig.defconfig +++ b/boards/electronut/nrf52840_blip/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF52840_BLIP -config BT_CTLR - default BT - endif # BOARD_NRF52840_BLIP diff --git a/boards/electronut/nrf52840_papyr/Kconfig.defconfig b/boards/electronut/nrf52840_papyr/Kconfig.defconfig index 94d55d43358..d61070ea97b 100644 --- a/boards/electronut/nrf52840_papyr/Kconfig.defconfig +++ b/boards/electronut/nrf52840_papyr/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF52840_PAPYR -config BT_CTLR - default BT - endif # BOARD_NRF52840_PAPYR diff --git a/boards/ezurio/bl5340_dvk/Kconfig.defconfig b/boards/ezurio/bl5340_dvk/Kconfig.defconfig index 0fbab147962..b71b51265b9 100644 --- a/boards/ezurio/bl5340_dvk/Kconfig.defconfig +++ b/boards/ezurio/bl5340_dvk/Kconfig.defconfig @@ -101,11 +101,6 @@ endif # BOARD_BL5340_DVK_NRF5340_CPUAPP || BOARD_BL5340_DVK_NRF5340_CPUAPP_NS if BOARD_BL5340_DVK_NRF5340_CPUNET -# BT_CTLR depends on BT. When BT is enabled we should default to also -# enabling the controller. -config BT_CTLR - default y if BT - config BT_ECC default y if BT diff --git a/boards/ezurio/bl652_dvk/Kconfig.defconfig b/boards/ezurio/bl652_dvk/Kconfig.defconfig index 62fac3e6c21..e7e6afee009 100644 --- a/boards/ezurio/bl652_dvk/Kconfig.defconfig +++ b/boards/ezurio/bl652_dvk/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_BL652_DVK -config BT_CTLR - default BT - if DAC config I2C diff --git a/boards/ezurio/bl653_dvk/Kconfig.defconfig b/boards/ezurio/bl653_dvk/Kconfig.defconfig index 43f19f65a6d..b2a37d4a6e3 100644 --- a/boards/ezurio/bl653_dvk/Kconfig.defconfig +++ b/boards/ezurio/bl653_dvk/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_BL653_DVK -config BT_CTLR - default BT - if DAC config I2C diff --git a/boards/ezurio/bl654_dvk/Kconfig.defconfig b/boards/ezurio/bl654_dvk/Kconfig.defconfig index dbd4fb812f0..c4b8594f891 100644 --- a/boards/ezurio/bl654_dvk/Kconfig.defconfig +++ b/boards/ezurio/bl654_dvk/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_BL654_DVK -config BT_CTLR - default BT - if DAC config I2C diff --git a/boards/ezurio/bl654_sensor_board/Kconfig.defconfig b/boards/ezurio/bl654_sensor_board/Kconfig.defconfig index 3ac458bcec9..ecdc77a2cdd 100644 --- a/boards/ezurio/bl654_sensor_board/Kconfig.defconfig +++ b/boards/ezurio/bl654_sensor_board/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_BL654_SENSOR_BOARD -config BT_CTLR - default BT - endif # BOARD_BL654_SENSOR_BOARD diff --git a/boards/ezurio/bl654_usb/Kconfig.defconfig b/boards/ezurio/bl654_usb/Kconfig.defconfig index baf624a0c5a..83f7c2a968a 100644 --- a/boards/ezurio/bl654_usb/Kconfig.defconfig +++ b/boards/ezurio/bl654_usb/Kconfig.defconfig @@ -53,7 +53,4 @@ config USB_DEVICE_LOG_LEVEL endif #BL654_USB_SERIAL_BACKEND_CDCACM -config BT_CTLR - default BT - endif # BOARD_BL654_USB diff --git a/boards/ezurio/bt510/Kconfig.defconfig b/boards/ezurio/bt510/Kconfig.defconfig index 70cb87fa1f7..42cd1488a22 100644 --- a/boards/ezurio/bt510/Kconfig.defconfig +++ b/boards/ezurio/bt510/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_BT510 -config BT_CTLR - default BT - config I2C default SENSOR diff --git a/boards/ezurio/bt610/Kconfig.defconfig b/boards/ezurio/bt610/Kconfig.defconfig index 9a82770655e..04963261957 100644 --- a/boards/ezurio/bt610/Kconfig.defconfig +++ b/boards/ezurio/bt610/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_BT610 -config BT_CTLR - default BT - config I2C default $(dt_compat_on_bus,$(DT_COMPAT_TI_TCA9538),i2c) diff --git a/boards/ezurio/mg100/Kconfig.defconfig b/boards/ezurio/mg100/Kconfig.defconfig index 0db2eee8478..ff0ba3feee1 100644 --- a/boards/ezurio/mg100/Kconfig.defconfig +++ b/boards/ezurio/mg100/Kconfig.defconfig @@ -15,7 +15,4 @@ config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE config REGULATOR default DISK_DRIVER_SDMMC -config BT_CTLR - default BT - endif # BOARD_MG100 diff --git a/boards/ezurio/pinnacle_100_dvk/Kconfig.defconfig b/boards/ezurio/pinnacle_100_dvk/Kconfig.defconfig index c53ec05d15a..299754eda5a 100644 --- a/boards/ezurio/pinnacle_100_dvk/Kconfig.defconfig +++ b/boards/ezurio/pinnacle_100_dvk/Kconfig.defconfig @@ -14,7 +14,4 @@ config MODEM_HL7800 config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE default 4096 -config BT_CTLR - default BT - endif # BOARD_PINNACLE_100_DVK diff --git a/boards/ezurio/rm1xx_dvk/Kconfig.defconfig b/boards/ezurio/rm1xx_dvk/Kconfig.defconfig index 01cbc05ee78..27d934196f1 100644 --- a/boards/ezurio/rm1xx_dvk/Kconfig.defconfig +++ b/boards/ezurio/rm1xx_dvk/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_RM1XX_DVK -config BT_CTLR - default BT - endif # BOARD_RM1XX_DVK diff --git a/boards/holyiot/yj16019/Kconfig.defconfig b/boards/holyiot/yj16019/Kconfig.defconfig index c4298c49d6e..4fa098bd482 100644 --- a/boards/holyiot/yj16019/Kconfig.defconfig +++ b/boards/holyiot/yj16019/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_HOLYIOT_YJ16019 -config BT_CTLR - default BT - endif # BOARD_HOLYIOT_YJ16019 diff --git a/boards/makerdiary/nrf52832_mdk/Kconfig.defconfig b/boards/makerdiary/nrf52832_mdk/Kconfig.defconfig index 13d65f68be1..471e9717248 100644 --- a/boards/makerdiary/nrf52832_mdk/Kconfig.defconfig +++ b/boards/makerdiary/nrf52832_mdk/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF52832_MDK -config BT_CTLR - default BT - endif # BOARD_NRF52832_MDK diff --git a/boards/makerdiary/nrf52840_mdk/Kconfig.defconfig b/boards/makerdiary/nrf52840_mdk/Kconfig.defconfig index 4ffd9e4ea08..52e88201e3c 100644 --- a/boards/makerdiary/nrf52840_mdk/Kconfig.defconfig +++ b/boards/makerdiary/nrf52840_mdk/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF52840_MDK -config BT_CTLR - default BT - endif # BOARD_NRF52840_MDK diff --git a/boards/makerdiary/nrf52840_mdk_usb_dongle/Kconfig.defconfig b/boards/makerdiary/nrf52840_mdk_usb_dongle/Kconfig.defconfig index eb2cfed745d..ae93b1ed6df 100644 --- a/boards/makerdiary/nrf52840_mdk_usb_dongle/Kconfig.defconfig +++ b/boards/makerdiary/nrf52840_mdk_usb_dongle/Kconfig.defconfig @@ -31,7 +31,4 @@ config SERIAL endif # USB_DEVICE_STACK -config BT_CTLR - default BT - endif # BOARD_NRF52840_MDK_USB_DONGLE diff --git a/boards/native/nrf_bsim/Kconfig.defconfig b/boards/native/nrf_bsim/Kconfig.defconfig index 271821c4edb..ad0934392a6 100644 --- a/boards/native/nrf_bsim/Kconfig.defconfig +++ b/boards/native/nrf_bsim/Kconfig.defconfig @@ -38,10 +38,6 @@ config SYS_CLOCK_TICKS_PER_SEC default 10000 if NRF_GRTC_TIMER default 32768 -config BT_CTLR - default y if BOARD_NRF52_BSIM || BOARD_NRF5340BSIM_NRF5340_CPUNET || BOARD_NRF54L15BSIM_NRF54L15_CPUAPP - depends on BT - config HEAP_MEM_POOL_ADD_SIZE_BOARD int default 4096 if BT_HCI_IPC diff --git a/boards/nordic/nrf21540dk/Kconfig.defconfig b/boards/nordic/nrf21540dk/Kconfig.defconfig index 28a3f3e2c98..31642d14409 100644 --- a/boards/nordic/nrf21540dk/Kconfig.defconfig +++ b/boards/nordic/nrf21540dk/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF21540DK -config BT_CTLR - default BT - endif # BOARD_NRF21540DK diff --git a/boards/nordic/nrf51dk/Kconfig.defconfig b/boards/nordic/nrf51dk/Kconfig.defconfig index ae8e85130f3..1f0b7bf0c49 100644 --- a/boards/nordic/nrf51dk/Kconfig.defconfig +++ b/boards/nordic/nrf51dk/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF51DK_NRF51822 -config BT_CTLR - default BT - endif # BOARD_NRF51DK_NRF51822 diff --git a/boards/nordic/nrf51dongle/Kconfig.defconfig b/boards/nordic/nrf51dongle/Kconfig.defconfig index fed53a7a316..e6c8d45f810 100644 --- a/boards/nordic/nrf51dongle/Kconfig.defconfig +++ b/boards/nordic/nrf51dongle/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF51DONGLE -config BT_CTLR - default BT - endif # BOARD_NRF51DONGLE diff --git a/boards/nordic/nrf52833dk/Kconfig.defconfig b/boards/nordic/nrf52833dk/Kconfig.defconfig index 30c49fa7fb7..dc6fbbdcf3d 100644 --- a/boards/nordic/nrf52833dk/Kconfig.defconfig +++ b/boards/nordic/nrf52833dk/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF52833DK -config BT_CTLR - default BT - endif # BOARD_NRF52833DK diff --git a/boards/nordic/nrf52840dk/Kconfig.defconfig b/boards/nordic/nrf52840dk/Kconfig.defconfig index 7e932d27f7a..478445b229b 100644 --- a/boards/nordic/nrf52840dk/Kconfig.defconfig +++ b/boards/nordic/nrf52840dk/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF52840DK -config BT_CTLR - default BT - endif # BOARD_NRF52840DK diff --git a/boards/nordic/nrf52840dongle/Kconfig.defconfig b/boards/nordic/nrf52840dongle/Kconfig.defconfig index 1288e33bcdb..0140f3f99d5 100644 --- a/boards/nordic/nrf52840dongle/Kconfig.defconfig +++ b/boards/nordic/nrf52840dongle/Kconfig.defconfig @@ -77,7 +77,4 @@ endif # USB_DEVICE_STACK endif # BOARD_SERIAL_BACKEND_CDC_ACM -config BT_CTLR - default BT - endif # BOARD_NRF52840DONGLE diff --git a/boards/nordic/nrf52dk/Kconfig b/boards/nordic/nrf52dk/Kconfig index 7b41e21fc49..45c182b7b91 100644 --- a/boards/nordic/nrf52dk/Kconfig +++ b/boards/nordic/nrf52dk/Kconfig @@ -5,9 +5,4 @@ if BOARD_NRF52DK -# BT_CTLR depends on BT. When BT is enabled we should default to also -# enabling the controller. -config BT_CTLR - default y if BT - endif # BOARD_NRF52DK diff --git a/boards/nordic/nrf5340_audio_dk/Kconfig.defconfig b/boards/nordic/nrf5340_audio_dk/Kconfig.defconfig index 196e0654cab..543afadd4f2 100644 --- a/boards/nordic/nrf5340_audio_dk/Kconfig.defconfig +++ b/boards/nordic/nrf5340_audio_dk/Kconfig.defconfig @@ -77,7 +77,4 @@ endif # BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP || BOARD_NRF5340_AUDIO_DK_NRF5340_ if BOARD_NRF5340_AUDIO_DK_NRF5340_CPUNET -config BT_CTLR - default y if BT - endif # BOARD_NRF5340_AUDIO_DK_NRF5340_CPUNET diff --git a/boards/nordic/nrf5340dk/Kconfig.defconfig b/boards/nordic/nrf5340dk/Kconfig.defconfig index 6f579cf6adf..67747c688ad 100644 --- a/boards/nordic/nrf5340dk/Kconfig.defconfig +++ b/boards/nordic/nrf5340dk/Kconfig.defconfig @@ -77,7 +77,4 @@ endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS if BOARD_NRF5340DK_NRF5340_CPUNET -config BT_CTLR - default y if BT - endif # BOARD_NRF5340DK_NRF5340_CPUNET diff --git a/boards/nordic/nrf54h20dk/Kconfig.defconfig b/boards/nordic/nrf54h20dk/Kconfig.defconfig index fd63b39f501..268722f5fe5 100644 --- a/boards/nordic/nrf54h20dk/Kconfig.defconfig +++ b/boards/nordic/nrf54h20dk/Kconfig.defconfig @@ -13,9 +13,6 @@ endif # BOARD_NRF54H20DK_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPURAD -config BT_CTLR - default y if BT - config MAX_THREAD_BYTES default 3 if USERSPACE diff --git a/boards/nordic/nrf54l15dk/Kconfig.defconfig b/boards/nordic/nrf54l15dk/Kconfig.defconfig index cbb822eec9c..639cbccf3f4 100644 --- a/boards/nordic/nrf54l15dk/Kconfig.defconfig +++ b/boards/nordic/nrf54l15dk/Kconfig.defconfig @@ -4,9 +4,6 @@ if BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \ BOARD_NRF54L15DK_NRF54L15_CPUAPP -config BT_CTLR - default BT - config ROM_START_OFFSET default 0x800 if BOOTLOADER_MCUBOOT diff --git a/boards/nordic/nrf54l20pdk/Kconfig.defconfig b/boards/nordic/nrf54l20pdk/Kconfig.defconfig index 850f69bdda0..f6987b80087 100644 --- a/boards/nordic/nrf54l20pdk/Kconfig.defconfig +++ b/boards/nordic/nrf54l20pdk/Kconfig.defconfig @@ -3,9 +3,6 @@ if BOARD_NRF54L20PDK_NRF54L20_CPUAPP -config BT_CTLR - default BT - config ROM_START_OFFSET default 0x800 if BOOTLOADER_MCUBOOT diff --git a/boards/nordic/nrf7002dk/Kconfig b/boards/nordic/nrf7002dk/Kconfig index 4297ddb4c16..e599cbcce07 100644 --- a/boards/nordic/nrf7002dk/Kconfig +++ b/boards/nordic/nrf7002dk/Kconfig @@ -32,9 +32,6 @@ endif if BOARD_NRF7002DK_NRF5340_CPUNET -config BT_CTLR - default y if BT - config BT_ECC default y if BT diff --git a/boards/nordic/nrf9160dk/Kconfig.defconfig b/boards/nordic/nrf9160dk/Kconfig.defconfig index 11880ae2a13..b26c68ef531 100644 --- a/boards/nordic/nrf9160dk/Kconfig.defconfig +++ b/boards/nordic/nrf9160dk/Kconfig.defconfig @@ -45,9 +45,6 @@ endif # BOARD_NRF9160DK_NRF9160 || BOARD_NRF9160DK_NRF9160_NS if BOARD_NRF9160DK_NRF52840 -config BT_CTLR - default BT - config BT_WAIT_NOP default BT && $(dt_nodelabel_enabled,reset_input) diff --git a/boards/nordic/nrf9280pdk/Kconfig.defconfig b/boards/nordic/nrf9280pdk/Kconfig.defconfig index c5c3576b4c2..d1252a0a3a2 100644 --- a/boards/nordic/nrf9280pdk/Kconfig.defconfig +++ b/boards/nordic/nrf9280pdk/Kconfig.defconfig @@ -10,9 +10,6 @@ endif # BOARD_NRF9280PDK_NRF9280_CPUAPP if BOARD_NRF9280PDK_NRF9280_CPURAD -config BT_CTLR - default y if BT - endif # BOARD_NRF9280PDK_NRF9280_CPURAD if BOARD_NRF9280PDK_NRF9280_CPUPPR diff --git a/boards/nordic/thingy52/Kconfig.defconfig b/boards/nordic/thingy52/Kconfig.defconfig index 40bdd8c6cdf..9e50838b5c2 100644 --- a/boards/nordic/thingy52/Kconfig.defconfig +++ b/boards/nordic/thingy52/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_THINGY52 -config BT_CTLR - default BT - endif # BOARD_THINGY52 diff --git a/boards/nordic/thingy53/Kconfig.defconfig b/boards/nordic/thingy53/Kconfig.defconfig index 92eac11503d..885318feb7e 100644 --- a/boards/nordic/thingy53/Kconfig.defconfig +++ b/boards/nordic/thingy53/Kconfig.defconfig @@ -136,9 +136,6 @@ endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS if BOARD_THINGY53_NRF5340_CPUNET -config BT_CTLR - default BT - config BT_ECC default BT diff --git a/boards/openisa/rv32m1_vega/Kconfig.defconfig b/boards/openisa/rv32m1_vega/Kconfig.defconfig index 08279d8ed04..c6a785858b5 100644 --- a/boards/openisa/rv32m1_vega/Kconfig.defconfig +++ b/boards/openisa/rv32m1_vega/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_RV32M1_VEGA if BT -config BT_CTLR - default y - #TODO: Resolve the complete non-BLE support for crypto CAU3 firmware/driver #config HAS_RV32M1_CAU3 # bool diff --git a/boards/panasonic/pan1770_evb/Kconfig.defconfig b/boards/panasonic/pan1770_evb/Kconfig.defconfig index 8a91e35369a..fc9670a22db 100644 --- a/boards/panasonic/pan1770_evb/Kconfig.defconfig +++ b/boards/panasonic/pan1770_evb/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_PAN1770_EVB -config BT_CTLR - default BT - endif # BOARD_PAN1770_EVB diff --git a/boards/panasonic/pan1780_evb/Kconfig.defconfig b/boards/panasonic/pan1780_evb/Kconfig.defconfig index 81bb7a60819..7c4acfad4b6 100644 --- a/boards/panasonic/pan1780_evb/Kconfig.defconfig +++ b/boards/panasonic/pan1780_evb/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_PAN1780_EVB -config BT_CTLR - default BT - endif # BOARD_PAN1780_EVB diff --git a/boards/panasonic/pan1781_evb/Kconfig.defconfig b/boards/panasonic/pan1781_evb/Kconfig.defconfig index 518676e3643..aacad9968c2 100644 --- a/boards/panasonic/pan1781_evb/Kconfig.defconfig +++ b/boards/panasonic/pan1781_evb/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_PAN1781_EVB -config BT_CTLR - default BT - endif # BOARD_PAN1781_EVB diff --git a/boards/panasonic/pan1782_evb/Kconfig.defconfig b/boards/panasonic/pan1782_evb/Kconfig.defconfig index c9136006be4..f3ad6583017 100644 --- a/boards/panasonic/pan1782_evb/Kconfig.defconfig +++ b/boards/panasonic/pan1782_evb/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_PAN1782_EVB -config BT_CTLR - default BT - endif # BOARD_PAN1782_EVB diff --git a/boards/panasonic/pan1783/Kconfig.defconfig b/boards/panasonic/pan1783/Kconfig.defconfig index 9f69518027a..f240f37ef85 100644 --- a/boards/panasonic/pan1783/Kconfig.defconfig +++ b/boards/panasonic/pan1783/Kconfig.defconfig @@ -16,7 +16,4 @@ endif # SOC_NRF5340_CPUAPP_QKAA if SOC_NRF5340_CPUNET_QKAA -config BT_CTLR - default y if BT - endif # SOC_NRF5340_CPUNET_QKAA diff --git a/boards/particle/argon/Kconfig.defconfig b/boards/particle/argon/Kconfig.defconfig index 72954154c71..7d17a09d99b 100644 --- a/boards/particle/argon/Kconfig.defconfig +++ b/boards/particle/argon/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_PARTICLE_ARGON -config BT_CTLR - default BT - endif # BOARD_PARTICLE_ARGON diff --git a/boards/particle/boron/Kconfig.defconfig b/boards/particle/boron/Kconfig.defconfig index cce1a36897f..6fefbf76846 100644 --- a/boards/particle/boron/Kconfig.defconfig +++ b/boards/particle/boron/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_PARTICLE_BORON -config BT_CTLR - default BT - if MODEM config MODEM_UBLOX_SARA diff --git a/boards/particle/nrf51_blenano/Kconfig.defconfig b/boards/particle/nrf51_blenano/Kconfig.defconfig index fb61b031143..a5f58e09899 100644 --- a/boards/particle/nrf51_blenano/Kconfig.defconfig +++ b/boards/particle/nrf51_blenano/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF51_BLENANO -config BT_CTLR - default BT - endif # BOARD_NRF51_BLENANO diff --git a/boards/particle/nrf52_blenano2/Kconfig.defconfig b/boards/particle/nrf52_blenano2/Kconfig.defconfig index df0bcd9b33a..5e57d952594 100644 --- a/boards/particle/nrf52_blenano2/Kconfig.defconfig +++ b/boards/particle/nrf52_blenano2/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF52_BLENANO2 -config BT_CTLR - default BT - endif # BOARD_NRF52_BLENANO2 diff --git a/boards/particle/xenon/Kconfig.defconfig b/boards/particle/xenon/Kconfig.defconfig index 1cd3ad31f06..f58b2e11792 100644 --- a/boards/particle/xenon/Kconfig.defconfig +++ b/boards/particle/xenon/Kconfig.defconfig @@ -6,7 +6,4 @@ if BOARD_PARTICLE_XENON -config BT_CTLR - default BT - endif # BOARD_PARTICLE_XENON diff --git a/boards/phytec/reel_board/Kconfig.defconfig b/boards/phytec/reel_board/Kconfig.defconfig index 68061a3ef3b..0436c7b1d7a 100644 --- a/boards/phytec/reel_board/Kconfig.defconfig +++ b/boards/phytec/reel_board/Kconfig.defconfig @@ -8,10 +8,6 @@ if BOARD_REEL_BOARD config I2C default y -config BT_CTLR - default y - depends on BT - if FXOS8700 choice FXOS8700_MODE diff --git a/boards/pine64/pinetime_devkit0/Kconfig.defconfig b/boards/pine64/pinetime_devkit0/Kconfig.defconfig index adfebb274d9..e83a778e2b6 100644 --- a/boards/pine64/pinetime_devkit0/Kconfig.defconfig +++ b/boards/pine64/pinetime_devkit0/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_PINETIME_DEVKIT0 -config BT_CTLR - default BT - config INPUT default y if LVGL diff --git a/boards/qorvo/decawave_dwm1001_dev/Kconfig.defconfig b/boards/qorvo/decawave_dwm1001_dev/Kconfig.defconfig index cd2a985b1eb..e29eec91cb3 100644 --- a/boards/qorvo/decawave_dwm1001_dev/Kconfig.defconfig +++ b/boards/qorvo/decawave_dwm1001_dev/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_DECAWAVE_DWM1001_DEV -config BT_CTLR - default BT - config I2C default SENSOR diff --git a/boards/qorvo/decawave_dwm3001cdk/Kconfig.defconfig b/boards/qorvo/decawave_dwm3001cdk/Kconfig.defconfig index 93c1b48a213..e645316caae 100644 --- a/boards/qorvo/decawave_dwm3001cdk/Kconfig.defconfig +++ b/boards/qorvo/decawave_dwm3001cdk/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_DECAWAVE_DWM3001CDK -config BT_CTLR - default BT - config I2C default SENSOR diff --git a/boards/rakwireless/rak4631/Kconfig.defconfig b/boards/rakwireless/rak4631/Kconfig.defconfig index bf7cf003b29..906754a1eb0 100644 --- a/boards/rakwireless/rak4631/Kconfig.defconfig +++ b/boards/rakwireless/rak4631/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_RAK4631 -config BT_CTLR - default BT - endif # BOARD_RAK4631 diff --git a/boards/rakwireless/rak5010/Kconfig.defconfig b/boards/rakwireless/rak5010/Kconfig.defconfig index 302f7fecd07..5d71cbdc1f4 100644 --- a/boards/rakwireless/rak5010/Kconfig.defconfig +++ b/boards/rakwireless/rak5010/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_RAK5010 -config BT_CTLR - default BT - endif # BOARD_RAK5010 diff --git a/boards/raytac/mdbt50q_db_33/Kconfig.defconfig b/boards/raytac/mdbt50q_db_33/Kconfig.defconfig index bb5e7c4a14d..4b8c325c77d 100644 --- a/boards/raytac/mdbt50q_db_33/Kconfig.defconfig +++ b/boards/raytac/mdbt50q_db_33/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_RAYTAC_MDBT50Q_DB_33 -config BT_CTLR - default BT - endif # BOARD_RAYTAC_MDBT50Q_DB_33 diff --git a/boards/raytac/mdbt50q_db_40/Kconfig.defconfig b/boards/raytac/mdbt50q_db_40/Kconfig.defconfig index 2919530e87c..b88aa0342fe 100644 --- a/boards/raytac/mdbt50q_db_40/Kconfig.defconfig +++ b/boards/raytac/mdbt50q_db_40/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_RAYTAC_MDBT50Q_DB_40 -config BT_CTLR - default BT - endif # BOARD_RAYTAC_MDBT50Q_DB_40 diff --git a/boards/raytac/mdbt53_db_40/Kconfig.defconfig b/boards/raytac/mdbt53_db_40/Kconfig.defconfig index dbbe13da493..40ae18ba31b 100644 --- a/boards/raytac/mdbt53_db_40/Kconfig.defconfig +++ b/boards/raytac/mdbt53_db_40/Kconfig.defconfig @@ -64,7 +64,4 @@ endif # BOARD_RAYTAC_MDBT53_DB_40_NRF5340_CPUAPP || BOARD_RAYTAC_MDBT53_DB_40_NR if BOARD_RAYTAC_MDBT53_DB_40_NRF5340_CPUNET -config BT_CTLR - default y if BT - endif # BOARD_RAYTAC_MDBT53_DB_40_NRF5340_CPUNET diff --git a/boards/raytac/mdbt53v_db_40/Kconfig.defconfig b/boards/raytac/mdbt53v_db_40/Kconfig.defconfig index b3f4fb77c5b..61e7592cc66 100644 --- a/boards/raytac/mdbt53v_db_40/Kconfig.defconfig +++ b/boards/raytac/mdbt53v_db_40/Kconfig.defconfig @@ -64,7 +64,4 @@ endif # BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP || BOARD_RAYTAC_MDBT53V_DB_40_ if BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUNET -config BT_CTLR - default y if BT - endif # BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUNET diff --git a/boards/ruuvi/ruuvitag/Kconfig.defconfig b/boards/ruuvi/ruuvitag/Kconfig.defconfig index 237d564c746..4b9d1f8360f 100644 --- a/boards/ruuvi/ruuvitag/Kconfig.defconfig +++ b/boards/ruuvi/ruuvitag/Kconfig.defconfig @@ -8,7 +8,4 @@ if BOARD_RUUVI_RUUVITAG config SPI default y -config BT_CTLR - default BT - endif # BOARD_RUUVI_RUUVITAG diff --git a/boards/seeed/xiao_ble/Kconfig.defconfig b/boards/seeed/xiao_ble/Kconfig.defconfig index d02785ec152..d5c4e1ee51c 100644 --- a/boards/seeed/xiao_ble/Kconfig.defconfig +++ b/boards/seeed/xiao_ble/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_XIAO_BLE -config BT_CTLR - default BT - if USB_DEVICE_STACK config UART_CONSOLE diff --git a/boards/shields/mikroe_ble_tiny_click/Kconfig.defconfig b/boards/shields/mikroe_ble_tiny_click/Kconfig.defconfig index db63d94f3c5..d6711f11874 100644 --- a/boards/shields/mikroe_ble_tiny_click/Kconfig.defconfig +++ b/boards/shields/mikroe_ble_tiny_click/Kconfig.defconfig @@ -3,4 +3,4 @@ CONFIG_BT_HCI=y CONFIG_BT_HCI_ACL_FLOW_CONTROL=n -CONFIG_BT_CTLR=n +CONFIG_BT_LL_SW_SPLIT=n diff --git a/boards/sparkfun/micromod/Kconfig.defconfig b/boards/sparkfun/micromod/Kconfig.defconfig index 50f6c3f582a..41cda3e459a 100644 --- a/boards/sparkfun/micromod/Kconfig.defconfig +++ b/boards/sparkfun/micromod/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_MICROMOD_NRF52840 -config BT_CTLR - default BT - endif # BOARD_MICROMOD_NRF52840 diff --git a/boards/sparkfun/nrf52_sparkfun/Kconfig.defconfig b/boards/sparkfun/nrf52_sparkfun/Kconfig.defconfig index 47d8a99ceca..415fd0eb5b5 100644 --- a/boards/sparkfun/nrf52_sparkfun/Kconfig.defconfig +++ b/boards/sparkfun/nrf52_sparkfun/Kconfig.defconfig @@ -6,7 +6,4 @@ if BOARD_NRF52_SPARKFUN -config BT_CTLR - default BT - endif # BOARD_NRF52_SPARKFUN diff --git a/boards/u-blox/ubx_bmd300eval/Kconfig.defconfig b/boards/u-blox/ubx_bmd300eval/Kconfig.defconfig index 8ba8ca2d640..f5d3c0f7f67 100644 --- a/boards/u-blox/ubx_bmd300eval/Kconfig.defconfig +++ b/boards/u-blox/ubx_bmd300eval/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_UBX_BMD300EVAL -config BT_CTLR - default BT - endif # BOARD_UBX_BMD300EVAL diff --git a/boards/u-blox/ubx_bmd330eval/Kconfig b/boards/u-blox/ubx_bmd330eval/Kconfig index fbc749c300a..a1d19f19bc8 100644 --- a/boards/u-blox/ubx_bmd330eval/Kconfig +++ b/boards/u-blox/ubx_bmd330eval/Kconfig @@ -2,8 +2,3 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 - -# BT_CTLR depends on BT. When BT is enabled we should default to also -# enabling the controller. -config BT_CTLR - default y if BT diff --git a/boards/u-blox/ubx_bmd340eval/Kconfig.defconfig b/boards/u-blox/ubx_bmd340eval/Kconfig.defconfig index 37b10951309..9db86863bba 100644 --- a/boards/u-blox/ubx_bmd340eval/Kconfig.defconfig +++ b/boards/u-blox/ubx_bmd340eval/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_UBX_BMD340EVAL -config BT_CTLR - default BT - endif # BOARD_UBX_BMD340EVAL diff --git a/boards/u-blox/ubx_bmd345eval/Kconfig.defconfig b/boards/u-blox/ubx_bmd345eval/Kconfig.defconfig index 21e8ac9b5ca..c972f6639f2 100644 --- a/boards/u-blox/ubx_bmd345eval/Kconfig.defconfig +++ b/boards/u-blox/ubx_bmd345eval/Kconfig.defconfig @@ -6,7 +6,4 @@ if BOARD_UBX_BMD345EVAL_NRF52840 -config BT_CTLR - default BT - endif # BOARD_UBX_BMD345EVAL_NRF52840 diff --git a/boards/u-blox/ubx_bmd360eval/Kconfig b/boards/u-blox/ubx_bmd360eval/Kconfig index 60b85dcb6dd..c0148fc1c4d 100644 --- a/boards/u-blox/ubx_bmd360eval/Kconfig +++ b/boards/u-blox/ubx_bmd360eval/Kconfig @@ -2,8 +2,3 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 - -# BT_CTLR depends on BT. When BT is enabled we should default to also -# enabling the controller. -config BT_CTLR - default y if BT diff --git a/boards/u-blox/ubx_bmd380eval/Kconfig.defconfig b/boards/u-blox/ubx_bmd380eval/Kconfig.defconfig index 58afb83796f..47907f3d4c9 100644 --- a/boards/u-blox/ubx_bmd380eval/Kconfig.defconfig +++ b/boards/u-blox/ubx_bmd380eval/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_UBX_BMD380EVAL -config BT_CTLR - default BT - endif # BOARD_UBX_BMD380EVAL diff --git a/boards/u-blox/ubx_evkannab1/Kconfig.defconfig b/boards/u-blox/ubx_evkannab1/Kconfig.defconfig index e12e7d4ebac..93aec0902b7 100644 --- a/boards/u-blox/ubx_evkannab1/Kconfig.defconfig +++ b/boards/u-blox/ubx_evkannab1/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_UBX_EVKANNAB1 -config BT_CTLR - default BT - endif # BOARD_UBX_EVKANNAB1 diff --git a/boards/u-blox/ubx_evkninab1/Kconfig.defconfig b/boards/u-blox/ubx_evkninab1/Kconfig.defconfig index 5f897eb6bb1..b657e5f34fb 100644 --- a/boards/u-blox/ubx_evkninab1/Kconfig.defconfig +++ b/boards/u-blox/ubx_evkninab1/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_UBX_EVKNINAB1 -config BT_CTLR - default BT - endif # BOARD_UBX_EVKNINAB1 diff --git a/boards/u-blox/ubx_evkninab3/Kconfig.defconfig b/boards/u-blox/ubx_evkninab3/Kconfig.defconfig index 2579b835428..f976dd594a8 100644 --- a/boards/u-blox/ubx_evkninab3/Kconfig.defconfig +++ b/boards/u-blox/ubx_evkninab3/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_UBX_EVKNINAB3 -config BT_CTLR - default BT - endif # BOARD_UBX_EVKNINAB3 diff --git a/boards/u-blox/ubx_evkninab4/Kconfig.defconfig b/boards/u-blox/ubx_evkninab4/Kconfig.defconfig index c9e958708bf..d710b03f842 100644 --- a/boards/u-blox/ubx_evkninab4/Kconfig.defconfig +++ b/boards/u-blox/ubx_evkninab4/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_UBX_EVKNINAB4 -config BT_CTLR - default BT - endif # BOARD_UBX_EVKNINAB4 diff --git a/boards/vngiotlab/nrf51_vbluno51/Kconfig.defconfig b/boards/vngiotlab/nrf51_vbluno51/Kconfig.defconfig index 4957faeb05c..ac83af0b12a 100644 --- a/boards/vngiotlab/nrf51_vbluno51/Kconfig.defconfig +++ b/boards/vngiotlab/nrf51_vbluno51/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF51_VBLUNO51 -config BT_CTLR - default BT - endif # BOARD_NRF51_VBLUNO51 diff --git a/boards/vngiotlab/nrf52_vbluno52/Kconfig.defconfig b/boards/vngiotlab/nrf52_vbluno52/Kconfig.defconfig index 700df41dfc6..026b4b301a7 100644 --- a/boards/vngiotlab/nrf52_vbluno52/Kconfig.defconfig +++ b/boards/vngiotlab/nrf52_vbluno52/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF52_VBLUNO52 -config BT_CTLR - default BT - endif # BOARD_NRF52_VBLUNO52 diff --git a/boards/waveshare/nrf51_ble400/Kconfig.defconfig b/boards/waveshare/nrf51_ble400/Kconfig.defconfig index 65d41b852d3..727fc35fece 100644 --- a/boards/waveshare/nrf51_ble400/Kconfig.defconfig +++ b/boards/waveshare/nrf51_ble400/Kconfig.defconfig @@ -5,7 +5,4 @@ if BOARD_NRF51_BLE400 -config BT_CTLR - default BT - endif # BOARD_NRF51_BLE400 diff --git a/boards/we/ophelia1ev/Kconfig.defconfig b/boards/we/ophelia1ev/Kconfig.defconfig index c148d677183..e380a1452e5 100644 --- a/boards/we/ophelia1ev/Kconfig.defconfig +++ b/boards/we/ophelia1ev/Kconfig.defconfig @@ -3,7 +3,4 @@ if BOARD_WE_OPHELIA1EV -config BT_CTLR - default BT - endif diff --git a/boards/we/proteus2ev/Kconfig.defconfig b/boards/we/proteus2ev/Kconfig.defconfig index dcdfd0a06e0..1733a45b3ab 100644 --- a/boards/we/proteus2ev/Kconfig.defconfig +++ b/boards/we/proteus2ev/Kconfig.defconfig @@ -3,7 +3,4 @@ if BOARD_WE_PROTEUS2EV_NRF52832 -config BT_CTLR - default BT - endif diff --git a/boards/we/proteus3ev/Kconfig.defconfig b/boards/we/proteus3ev/Kconfig.defconfig index ef564abbcbc..a75ef22e02f 100644 --- a/boards/we/proteus3ev/Kconfig.defconfig +++ b/boards/we/proteus3ev/Kconfig.defconfig @@ -3,7 +3,4 @@ if BOARD_WE_PROTEUS3EV -config BT_CTLR - default BT - endif # BOARD_WE_PROTEUS3EV diff --git a/drivers/crypto/Kconfig.nrf_ecb b/drivers/crypto/Kconfig.nrf_ecb index 624baedab09..a5b88eef6d0 100644 --- a/drivers/crypto/Kconfig.nrf_ecb +++ b/drivers/crypto/Kconfig.nrf_ecb @@ -10,6 +10,6 @@ config CRYPTO_NRF_ECB # Bluetooth controller uses the ECB peripheral directly # (see subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ecb.c), # hence this driver cannot be enabled together with it. - depends on !BT_CTLR + depends on !HAS_BT_CTLR help Enable nRF HAL-based AES ECB encryption driver diff --git a/samples/bluetooth/direction_finding_central/boards/nrf52833dk_nrf52820.conf b/samples/bluetooth/direction_finding_central/boards/nrf52833dk_nrf52820.conf index dafd888a1f9..9d242b0b254 100644 --- a/samples/bluetooth/direction_finding_central/boards/nrf52833dk_nrf52820.conf +++ b/samples/bluetooth/direction_finding_central/boards/nrf52833dk_nrf52820.conf @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y - # Enable Direction Finding Feature including AoA and AoD CONFIG_BT_CTLR_DF=y diff --git a/samples/bluetooth/direction_finding_central/boards/nrf52833dk_nrf52833.conf b/samples/bluetooth/direction_finding_central/boards/nrf52833dk_nrf52833.conf index dafd888a1f9..9d242b0b254 100644 --- a/samples/bluetooth/direction_finding_central/boards/nrf52833dk_nrf52833.conf +++ b/samples/bluetooth/direction_finding_central/boards/nrf52833dk_nrf52833.conf @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y - # Enable Direction Finding Feature including AoA and AoD CONFIG_BT_CTLR_DF=y diff --git a/samples/bluetooth/direction_finding_connectionless_rx/boards/nrf52833dk_nrf52820.conf b/samples/bluetooth/direction_finding_connectionless_rx/boards/nrf52833dk_nrf52820.conf index 97ce8320ff7..67f6bebd9f3 100644 --- a/samples/bluetooth/direction_finding_connectionless_rx/boards/nrf52833dk_nrf52820.conf +++ b/samples/bluetooth/direction_finding_connectionless_rx/boards/nrf52833dk_nrf52820.conf @@ -1,6 +1,3 @@ -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y - CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_SYNC_PERIODIC=y diff --git a/samples/bluetooth/direction_finding_connectionless_rx/boards/nrf52833dk_nrf52833.conf b/samples/bluetooth/direction_finding_connectionless_rx/boards/nrf52833dk_nrf52833.conf index f27dc630624..e613c127a82 100644 --- a/samples/bluetooth/direction_finding_connectionless_rx/boards/nrf52833dk_nrf52833.conf +++ b/samples/bluetooth/direction_finding_connectionless_rx/boards/nrf52833dk_nrf52833.conf @@ -1,6 +1,3 @@ -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y - CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_SYNC_PERIODIC=y diff --git a/samples/bluetooth/direction_finding_connectionless_tx/boards/nrf52833dk_nrf52820.conf b/samples/bluetooth/direction_finding_connectionless_tx/boards/nrf52833dk_nrf52820.conf index d82ed5bbba5..fc139039737 100644 --- a/samples/bluetooth/direction_finding_connectionless_tx/boards/nrf52833dk_nrf52820.conf +++ b/samples/bluetooth/direction_finding_connectionless_tx/boards/nrf52833dk_nrf52820.conf @@ -1,6 +1,3 @@ -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y - CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_ADV_PERIODIC=y diff --git a/samples/bluetooth/direction_finding_connectionless_tx/boards/nrf52833dk_nrf52833.conf b/samples/bluetooth/direction_finding_connectionless_tx/boards/nrf52833dk_nrf52833.conf index d82ed5bbba5..fc139039737 100644 --- a/samples/bluetooth/direction_finding_connectionless_tx/boards/nrf52833dk_nrf52833.conf +++ b/samples/bluetooth/direction_finding_connectionless_tx/boards/nrf52833dk_nrf52833.conf @@ -1,6 +1,3 @@ -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y - CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_ADV_PERIODIC=y diff --git a/samples/bluetooth/direction_finding_peripheral/boards/nrf52833dk_nrf52820.conf b/samples/bluetooth/direction_finding_peripheral/boards/nrf52833dk_nrf52820.conf index 4e006fa81eb..4119158890a 100644 --- a/samples/bluetooth/direction_finding_peripheral/boards/nrf52833dk_nrf52820.conf +++ b/samples/bluetooth/direction_finding_peripheral/boards/nrf52833dk_nrf52820.conf @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y - # Enable Direction Finding Feature including AoA and AoD CONFIG_BT_CTLR_DF=y diff --git a/samples/bluetooth/direction_finding_peripheral/boards/nrf52833dk_nrf52833.conf b/samples/bluetooth/direction_finding_peripheral/boards/nrf52833dk_nrf52833.conf index 4e006fa81eb..4119158890a 100644 --- a/samples/bluetooth/direction_finding_peripheral/boards/nrf52833dk_nrf52833.conf +++ b/samples/bluetooth/direction_finding_peripheral/boards/nrf52833dk_nrf52833.conf @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y - # Enable Direction Finding Feature including AoA and AoD CONFIG_BT_CTLR_DF=y diff --git a/samples/bluetooth/hci_uart/README.rst b/samples/bluetooth/hci_uart/README.rst index ac909319a80..5c5ab8b7198 100644 --- a/samples/bluetooth/hci_uart/README.rst +++ b/samples/bluetooth/hci_uart/README.rst @@ -178,7 +178,7 @@ driver instead of the built-in controller: .. code-block:: cfg CONFIG_BT_HCI=y - CONFIG_BT_CTLR=n + CONFIG_BT_LL_SW_SPLIT=n Similarly, the ``zephyr,bt-hci`` DTS property selects which HCI instance to use. The UART needs to have as its child node a HCI UART node: diff --git a/samples/bluetooth/hci_uart_3wire/README.rst b/samples/bluetooth/hci_uart_3wire/README.rst index 6ebb9de32fd..df99c17c0a8 100644 --- a/samples/bluetooth/hci_uart_3wire/README.rst +++ b/samples/bluetooth/hci_uart_3wire/README.rst @@ -178,7 +178,7 @@ driver instead of the built-in controller: .. code-block:: cfg CONFIG_BT_HCI=y - CONFIG_BT_CTLR=n + CONFIG_BT_LL_SW_SPLIT=n Similarly, the ``zephyr,bt-hci`` DTS property selects which HCI instance to use. The UART needs to have as its child node a HCI UART node: diff --git a/samples/bluetooth/hci_uart_async/README.rst b/samples/bluetooth/hci_uart_async/README.rst index 0bf85fdb765..ce1a369b2fc 100644 --- a/samples/bluetooth/hci_uart_async/README.rst +++ b/samples/bluetooth/hci_uart_async/README.rst @@ -146,7 +146,7 @@ driver instead of the built-in controller: .. code-block:: cfg CONFIG_BT_HCI=y - CONFIG_BT_CTLR=n + CONFIG_BT_LL_SW_SPLIT=n Similarly, the ``zephyr,bt-hci`` DTS property selects which HCI instance to use. The UART needs to have as its child node a HCI UART node: diff --git a/samples/boards/phytec/reel_board/mesh_badge/prj.conf b/samples/boards/phytec/reel_board/mesh_badge/prj.conf index cce6826abb8..ad6f656f301 100644 --- a/samples/boards/phytec/reel_board/mesh_badge/prj.conf +++ b/samples/boards/phytec/reel_board/mesh_badge/prj.conf @@ -2,7 +2,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=4096 CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_DEVICE_NAME_DYNAMIC=y CONFIG_BT_DEVICE_NAME_GATT_WRITABLE=y diff --git a/snippets/bt-ll-sw-split/README.rst b/snippets/bt-ll-sw-split/README.rst index 1c7161b22f1..f4ae66549a1 100644 --- a/snippets/bt-ll-sw-split/README.rst +++ b/snippets/bt-ll-sw-split/README.rst @@ -21,4 +21,3 @@ Requirements Hardware support for: - :kconfig:option:`CONFIG_BT` -- :kconfig:option:`CONFIG_BT_CTLR` diff --git a/snippets/bt-ll-sw-split/bt-ll-sw-split.conf b/snippets/bt-ll-sw-split/bt-ll-sw-split.conf index f2dd622901b..9c56e28779b 100644 --- a/snippets/bt-ll-sw-split/bt-ll-sw-split.conf +++ b/snippets/bt-ll-sw-split/bt-ll-sw-split.conf @@ -1,3 +1 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y diff --git a/subsys/bluetooth/CMakeLists.txt b/subsys/bluetooth/CMakeLists.txt index 1bebfd98ff2..44b3dd9503b 100644 --- a/subsys/bluetooth/CMakeLists.txt +++ b/subsys/bluetooth/CMakeLists.txt @@ -11,7 +11,7 @@ add_subdirectory_ifdef(CONFIG_BT_MESH mesh) add_subdirectory_ifdef(CONFIG_BT_AUDIO audio) add_subdirectory_ifdef(CONFIG_BT_CRYPTO crypto) -if(CONFIG_BT_CTLR AND CONFIG_BT_LL_SW_SPLIT) +if(CONFIG_BT_LL_SW_SPLIT) add_subdirectory(controller) endif() diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig index e03501d6500..1665059ce33 100644 --- a/subsys/bluetooth/Kconfig +++ b/subsys/bluetooth/Kconfig @@ -119,7 +119,7 @@ if BT_CONN config BT_HCI_ACL_FLOW_CONTROL bool "Controller to Host ACL flow control support" # Enable if building a Host-only build - default y if !BT_CTLR && !BT_STM32_IPM && !BT_ESP32 && !BT_STM32WBA + default y if !HAS_BT_CTLR && !BT_STM32_IPM && !BT_ESP32 && !BT_STM32WBA # Enable if building a Controller-only build default y if BT_HCI_RAW select POLL @@ -141,42 +141,42 @@ config BT_REMOTE_VERSION config BT_PHY_UPDATE bool "PHY Update" default y - depends on !BT_CTLR || BT_CTLR_PHY_UPDATE_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_PHY_UPDATE_SUPPORT help Enable support for Bluetooth 5.0 PHY Update Procedure. config BT_DATA_LEN_UPDATE bool "Data Length Update" default y if ((BT_BUF_ACL_TX_SIZE > 27) || (BT_BUF_ACL_RX_SIZE > 27)) - depends on !BT_CTLR || BT_CTLR_DATA_LEN_UPDATE_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_DATA_LEN_UPDATE_SUPPORT help Enable support for Bluetooth v4.2 LE Data Length Update procedure. config BT_PER_ADV_SYNC_TRANSFER_RECEIVER bool "Periodic Advertising Sync Transfer receiver" - depends on BT_PER_ADV_SYNC && BT_CONN && (!BT_CTLR || BT_CTLR_SYNC_TRANSFER_RECEIVER_SUPPORT) + depends on BT_PER_ADV_SYNC && BT_CONN && (!HAS_BT_CTLR || BT_CTLR_SYNC_TRANSFER_RECEIVER_SUPPORT) config BT_PER_ADV_SYNC_TRANSFER_SENDER bool "Periodic Advertising Sync Transfer sender" - depends on (BT_PER_ADV_SYNC || BT_PER_ADV) && BT_CONN && (!BT_CTLR || BT_CTLR_SYNC_TRANSFER_SENDER_SUPPORT) + depends on (BT_PER_ADV_SYNC || BT_PER_ADV) && BT_CONN && (!HAS_BT_CTLR || BT_CTLR_SYNC_TRANSFER_SENDER_SUPPORT) config BT_SCA_UPDATE bool "Sleep Clock Accuracy Update" default y if BT_ISO_PERIPHERAL || BT_ISO_CENTRAL - depends on !BT_CTLR || BT_CTLR_SCA_UPDATE_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_SCA_UPDATE_SUPPORT help Enable support for Bluetooth 5.1 Sleep Clock Accuracy Update Procedure config BT_TRANSMIT_POWER_CONTROL bool "LE Power Control" - depends on !BT_CTLR || BT_CTLR_LE_POWER_CONTROL_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_LE_POWER_CONTROL_SUPPORT help Enable support for LE Power Control Request feature that is defined in the Bluetooth Core specification, Version 5.4 | Vol 6, Part B, Section 4.6.31. config BT_PATH_LOSS_MONITORING bool "LE Path Loss Monitoring" - depends on !BT_CTLR || BT_CTLR_LE_PATH_LOSS_MONITORING_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_LE_PATH_LOSS_MONITORING_SUPPORT help Enable support for LE Path Loss Monitoring feature that is defined in the Bluetooth Core specification, Version 5.4 | Vol 6, Part B, Section 4.6.32. @@ -184,7 +184,7 @@ config BT_PATH_LOSS_MONITORING config BT_SUBRATING bool "LE Connection Subrating [EXPERIMENTAL]" select EXPERIMENTAL - depends on !BT_CTLR || BT_CTLR_SUBRATING_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_SUBRATING_SUPPORT help Enable support for LE Connection Subrating feature that is defined in the Bluetooth Core specification, Version 5.4 | Vol 6, Part B, Section 4.6.35. @@ -192,7 +192,7 @@ config BT_SUBRATING config BT_CHANNEL_SOUNDING bool "Channel Sounding [EXPERIMENTAL]" select EXPERIMENTAL - depends on !BT_CTLR || BT_CTLR_CHANNEL_SOUNDING_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_CHANNEL_SOUNDING_SUPPORT help Enable support for Bluetooth 6.0 Channel Sounding feature. diff --git a/subsys/bluetooth/Kconfig.adv b/subsys/bluetooth/Kconfig.adv index 233ee20d4cb..99b40250a94 100644 --- a/subsys/bluetooth/Kconfig.adv +++ b/subsys/bluetooth/Kconfig.adv @@ -6,7 +6,7 @@ config BT_EXT_ADV bool "Extended Advertising and Scanning support" - depends on !BT_CTLR || BT_CTLR_ADV_EXT_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_ADV_EXT_SUPPORT default y if BT_MESH help Select this to enable Extended Advertising API support. diff --git a/subsys/bluetooth/Kconfig.iso b/subsys/bluetooth/Kconfig.iso index 714ed0c1d97..4c7bb9a03e3 100644 --- a/subsys/bluetooth/Kconfig.iso +++ b/subsys/bluetooth/Kconfig.iso @@ -26,7 +26,7 @@ config BT_ISO_UNICAST config BT_ISO_PERIPHERAL bool "Bluetooth Isochronous Channel Unicast Peripheral Support" - depends on !BT_CTLR || BT_CTLR_PERIPHERAL_ISO_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_PERIPHERAL_ISO_SUPPORT depends on BT_PERIPHERAL select BT_ISO_UNICAST help @@ -35,7 +35,7 @@ config BT_ISO_PERIPHERAL config BT_ISO_CENTRAL bool "Bluetooth Isochronous Channel Unicast Central Support" - depends on !BT_CTLR || BT_CTLR_CENTRAL_ISO_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_CENTRAL_ISO_SUPPORT depends on BT_CENTRAL select BT_ISO_UNICAST help @@ -49,7 +49,7 @@ config BT_ISO_BROADCAST config BT_ISO_BROADCASTER bool "Bluetooth Isochronous Broadcaster Support" - depends on !BT_CTLR || BT_CTLR_ADV_ISO_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_ADV_ISO_SUPPORT select BT_ISO_BROADCAST select BT_ISO_TX select BT_BROADCASTER @@ -59,7 +59,7 @@ config BT_ISO_BROADCASTER config BT_ISO_SYNC_RECEIVER bool "Bluetooth Isochronous Synchronized Receiver Support" - depends on !BT_CTLR || BT_CTLR_SYNC_ISO_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_SYNC_ISO_SUPPORT depends on BT_OBSERVER select BT_ISO_BROADCAST select BT_ISO_RX diff --git a/subsys/bluetooth/common/Kconfig b/subsys/bluetooth/common/Kconfig index c79beea2da4..afba64312ef 100644 --- a/subsys/bluetooth/common/Kconfig +++ b/subsys/bluetooth/common/Kconfig @@ -203,7 +203,7 @@ config BT_HAS_HCI_VS config BT_HCI_VS bool "Zephyr HCI Vendor-Specific Commands" - depends on BT_HAS_HCI_VS || !BT_CTLR + depends on BT_HAS_HCI_VS || !HAS_BT_CTLR default y if BT_HAS_HCI_VS help Enable support for the Zephyr HCI Vendor-Specific Commands in the @@ -219,7 +219,7 @@ config BT_HCI_VS_FATAL_ERROR config BT_HCI_VS_EXT_DETECT bool "Use heuristics to guess HCI vendor extensions support in advance" - depends on BT_HCI_VS && !BT_CTLR + depends on BT_HCI_VS && !HAS_BT_CTLR default y if BOARD_QEMU_X86 || BOARD_QEMU_CORTEX_M3 || BOARD_NATIVE_POSIX || BOARD_NATIVE_SIM help Use some heuristics to try to guess in advance whether the controller diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index 9de6a99eeaa..fe44e29a75c 100644 --- a/subsys/bluetooth/controller/Kconfig +++ b/subsys/bluetooth/controller/Kconfig @@ -121,38 +121,39 @@ config BT_CTLR_SUBRATING_SUPPORT config BT_CTLR_CHANNEL_SOUNDING_SUPPORT bool -config BT_CTLR - bool "Bluetooth Controller" - help - Enables support for SoC native controller implementations. - -if BT_CTLR +# Virtual option that all local LL implemenations should select +config HAS_BT_CTLR + bool -choice BT_LL_CHOICE - prompt "Bluetooth Link Layer Selection" +config BT_CTLR + bool "Bluetooth Controller [DEPRECATED]" + select HAS_BT_CTLR + select DEPRECATED help - Select the Bluetooth Link Layer to compile. - The link layer choice list can be extended out of tree. - In the nRF Connect SDK, the SoftDevice Controller is selected - and set as the default Bluetooth Controller. + 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 BLE Link Layer" + default y depends on DT_HAS_ZEPHYR_BT_HCI_LL_SW_SPLIT_ENABLED + select HAS_BT_CTLR help Use Zephyr software BLE Link Layer ULL LLL split implementation. -endchoice - config BT_CTLR_HCI bool "Host Controller Interface (HCI)" default y - depends on DT_HAS_ZEPHYR_BT_HCI_LL_SW_SPLIT_ENABLED + depends on HAS_BT_CTLR help Enable the Host Controller interface (HCI) in the Controller. This should almost always be enabled, except in a few special cases, like for unit testing. +if HAS_BT_CTLR + comment "BLE Controller configuration" config BT_CTLR_ENTROPY @@ -1102,7 +1103,7 @@ config BT_CTLR_VS_SCAN_REQ_RX help Enables usage of VS Scan Request Reports Command and Scan Request Received Event -endif # BT_CTLR +endif # HAS_BT_CTLR config BT_CTLR_DEBUG_PINS_CPUAPP bool "Bluetooth Controller Debug Pins" diff --git a/subsys/bluetooth/controller/coex/Kconfig b/subsys/bluetooth/controller/coex/Kconfig index b7bc7d30681..456376164ad 100644 --- a/subsys/bluetooth/controller/coex/Kconfig +++ b/subsys/bluetooth/controller/coex/Kconfig @@ -6,7 +6,7 @@ menuconfig BT_CTLR_COEX_DRIVERS bool "Bluetooth Co-existence Drivers" default y - depends on BT_CTLR && DT_HAS_GPIO_RADIO_COEX_ENABLED + depends on HAS_BT_CTLR && DT_HAS_GPIO_RADIO_COEX_ENABLED if BT_CTLR_COEX_DRIVERS diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig index 8480d9549d9..0478de2f45a 100644 --- a/subsys/bluetooth/host/Kconfig +++ b/subsys/bluetooth/host/Kconfig @@ -48,9 +48,9 @@ config BT_HCI_TX_STACK_SIZE default 512 if BT_H4 default 512 if BT_H5 default 416 if BT_SPI - default 1280 if BT_CTLR && BT_LL_SW_SPLIT && (NO_OPTIMIZATIONS || BT_ISO_BROADCAST) - default 1024 if BT_CTLR && BT_LL_SW_SPLIT && BT_CENTRAL - default 768 if BT_CTLR && BT_LL_SW_SPLIT + default 1280 if BT_LL_SW_SPLIT && (NO_OPTIMIZATIONS || BT_ISO_BROADCAST) + default 1024 if BT_LL_SW_SPLIT && BT_CENTRAL + default 768 if BT_LL_SW_SPLIT default 512 if BT_USERCHAN default 640 if BT_STM32_IPM # Even if no driver is selected the following default is still @@ -903,7 +903,7 @@ config BT_ID_MAX config BT_DF bool "Direction Finding support [EXPERIMENTAL]" - depends on !BT_CTLR || BT_CTLR_DF_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_DF_SUPPORT select EXPERIMENTAL help Enable support for Bluetooth 5.1 Direction Finding. @@ -914,28 +914,28 @@ if BT_DF config BT_DF_CONNECTIONLESS_CTE_RX bool "Support for receive of CTE in connectionless mode" - depends on !BT_CTLR || BT_CTLR_DF_CTE_RX_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_DF_CTE_RX_SUPPORT help Enable support for reception and sampling of Constant Tone Extension in connectionless mode. config BT_DF_CONNECTIONLESS_CTE_TX bool "Support for transmission of CTE in connectionless mode" - depends on !BT_CTLR || BT_CTLR_DF_CTE_TX_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_DF_CTE_TX_SUPPORT help Enable support for transmission of Constant Tone Extension in connectionless mode. config BT_DF_CONNECTION_CTE_RX bool "Support for receive of CTE in connection mode" - depends on !BT_CTLR || BT_CTLR_DF_CTE_RX_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_DF_CTE_RX_SUPPORT help Enable support for reception and sampling of Constant Tone Extension in connection mode. config BT_DF_CONNECTION_CTE_TX bool "Support for transmission of CTE in connection mode" - depends on !BT_CTLR || BT_CTLR_DF_CTE_TX_SUPPORT + depends on !HAS_BT_CTLR || BT_CTLR_DF_CTE_TX_SUPPORT help Enable support for transmission of Constant Tone Extension in connection mode. @@ -1009,7 +1009,7 @@ config BT_SEND_ECC_EMULATION select MBEDTLS_PSA_P256M_DRIVER_ENABLED if MBEDTLS_PSA_CRYPTO_C select BT_LONG_WQ depends on BT_ECC && (BT_HCI_RAW || BT_HCI_HOST) - default y if BT_CTLR && !BT_CTLR_ECDH + default y if HAS_BT_CTLR && !BT_CTLR_ECDH help If this option is set PSA Crypto API library is used for emulating the ECDH HCI commands and events needed by e.g. LE Secure Connections. diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c index c0e87a30966..23424d676c7 100644 --- a/subsys/bluetooth/host/conn.c +++ b/subsys/bluetooth/host/conn.c @@ -1716,7 +1716,7 @@ static bool can_initiate_feature_exchange(struct bt_conn *conn) * controller, as we know at compile time whether it supports or not * peripheral feature exchange. */ - bool onboard_controller = IS_ENABLED(CONFIG_BT_CTLR); + bool onboard_controller = IS_ENABLED(CONFIG_HAS_BT_CTLR); bool supports_peripheral_feature_exchange = IS_ENABLED(CONFIG_BT_CTLR_PER_INIT_FEAT_XCHG); bool is_central = IS_ENABLED(CONFIG_BT_CENTRAL) && conn->role == BT_HCI_ROLE_CENTRAL; diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig index 7a54c3c710a..395284e80fa 100644 --- a/subsys/bluetooth/mesh/Kconfig +++ b/subsys/bluetooth/mesh/Kconfig @@ -94,7 +94,7 @@ endif # BT_MESH_ADV_LEGACY menuconfig BT_MESH_ADV_EXT bool "Extended advertising" - depends on BT_CTLR_ADV_EXT || !BT_CTLR + depends on BT_CTLR_ADV_EXT || !HAS_BT_CTLR depends on BT_EXT_ADV help Use extended advertising commands for operating the advertiser. diff --git a/tests/bluetooth/addr/prj.conf b/tests/bluetooth/addr/prj.conf index 1f86a43c208..807ba6ae741 100644 --- a/tests/bluetooth/addr/prj.conf +++ b/tests/bluetooth/addr/prj.conf @@ -2,5 +2,5 @@ CONFIG_TEST=y CONFIG_ZTEST=y CONFIG_BT=y -CONFIG_BT_CTLR=n +CONFIG_BT_LL_SW_SPLIT=n CONFIG_BT_H4=n diff --git a/tests/bluetooth/bluetooth/prj.conf b/tests/bluetooth/bluetooth/prj.conf index 43ee74e49e6..2f4223d93dc 100644 --- a/tests/bluetooth/bluetooth/prj.conf +++ b/tests/bluetooth/bluetooth/prj.conf @@ -1,5 +1,5 @@ CONFIG_BT=y -CONFIG_BT_CTLR=n +CONFIG_BT_LL_SW_SPLIT=n CONFIG_BT_H4=n CONFIG_LOG=y CONFIG_UART_INTERRUPT_DRIVEN=n diff --git a/tests/bluetooth/bt_crypto/prj.conf b/tests/bluetooth/bt_crypto/prj.conf index 1f86a43c208..807ba6ae741 100644 --- a/tests/bluetooth/bt_crypto/prj.conf +++ b/tests/bluetooth/bt_crypto/prj.conf @@ -2,5 +2,5 @@ CONFIG_TEST=y CONFIG_ZTEST=y CONFIG_BT=y -CONFIG_BT_CTLR=n +CONFIG_BT_LL_SW_SPLIT=n CONFIG_BT_H4=n diff --git a/tests/bluetooth/bt_crypto_ccm/prj.conf b/tests/bluetooth/bt_crypto_ccm/prj.conf index 4ab1d5395f7..2bdf2c58110 100644 --- a/tests/bluetooth/bt_crypto_ccm/prj.conf +++ b/tests/bluetooth/bt_crypto_ccm/prj.conf @@ -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 CONFIG_LOG=y diff --git a/tests/bluetooth/controller/ctrl_api/prj.conf b/tests/bluetooth/controller/ctrl_api/prj.conf index a7d8ebfd28a..91efec95088 100644 --- a/tests/bluetooth/controller/ctrl_api/prj.conf +++ b/tests/bluetooth/controller/ctrl_api/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_chmu/prj.conf b/tests/bluetooth/controller/ctrl_chmu/prj.conf index a7d8ebfd28a..91efec95088 100644 --- a/tests/bluetooth/controller/ctrl_chmu/prj.conf +++ b/tests/bluetooth/controller/ctrl_chmu/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_cis_create/prj.conf b/tests/bluetooth/controller/ctrl_cis_create/prj.conf index 3074f9f35d1..74d96a8f540 100644 --- a/tests/bluetooth/controller/ctrl_cis_create/prj.conf +++ b/tests/bluetooth/controller/ctrl_cis_create/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_cis_terminate/prj.conf b/tests/bluetooth/controller/ctrl_cis_terminate/prj.conf index 3074f9f35d1..74d96a8f540 100644 --- a/tests/bluetooth/controller/ctrl_cis_terminate/prj.conf +++ b/tests/bluetooth/controller/ctrl_cis_terminate/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_collision/prj.conf b/tests/bluetooth/controller/ctrl_collision/prj.conf index 2efb6786d7c..a39723a26cf 100644 --- a/tests/bluetooth/controller/ctrl_collision/prj.conf +++ b/tests/bluetooth/controller/ctrl_collision/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_conn_update/prj.conf b/tests/bluetooth/controller/ctrl_conn_update/prj.conf index 2b392fdf13d..1127bfea2b0 100644 --- a/tests/bluetooth/controller/ctrl_conn_update/prj.conf +++ b/tests/bluetooth/controller/ctrl_conn_update/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_MAX_CONN=4 CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_conn_update/prj_apm.conf b/tests/bluetooth/controller/ctrl_conn_update/prj_apm.conf index dcaecf5050c..95bdb78e0b3 100644 --- a/tests/bluetooth/controller/ctrl_conn_update/prj_apm.conf +++ b/tests/bluetooth/controller/ctrl_conn_update/prj_apm.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_MAX_CONN=4 CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_conn_update/prj_no_param_req.conf b/tests/bluetooth/controller/ctrl_conn_update/prj_no_param_req.conf index 6278afaffb1..9b39c686028 100644 --- a/tests/bluetooth/controller/ctrl_conn_update/prj_no_param_req.conf +++ b/tests/bluetooth/controller/ctrl_conn_update/prj_no_param_req.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_MAX_CONN=4 CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_cte_req/prj.conf b/tests/bluetooth/controller/ctrl_cte_req/prj.conf index 0d521c3e75e..441fde8122b 100644 --- a/tests/bluetooth/controller/ctrl_cte_req/prj.conf +++ b/tests/bluetooth/controller/ctrl_cte_req/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_ACL_RX_SIZE=251 diff --git a/tests/bluetooth/controller/ctrl_data_length_update/prj.conf b/tests/bluetooth/controller/ctrl_data_length_update/prj.conf index be14c4efa44..29810875d88 100644 --- a/tests/bluetooth/controller/ctrl_data_length_update/prj.conf +++ b/tests/bluetooth/controller/ctrl_data_length_update/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_data_length_update/prj_nocoded.conf b/tests/bluetooth/controller/ctrl_data_length_update/prj_nocoded.conf index e27ad98dad8..3ac3dc235c8 100644 --- a/tests/bluetooth/controller/ctrl_data_length_update/prj_nocoded.conf +++ b/tests/bluetooth/controller/ctrl_data_length_update/prj_nocoded.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_data_length_update/prj_nophy.conf b/tests/bluetooth/controller/ctrl_data_length_update/prj_nophy.conf index 85708da1320..d23d04ff4fb 100644 --- a/tests/bluetooth/controller/ctrl_data_length_update/prj_nophy.conf +++ b/tests/bluetooth/controller/ctrl_data_length_update/prj_nophy.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_encrypt/prj.conf b/tests/bluetooth/controller/ctrl_encrypt/prj.conf index be14c4efa44..29810875d88 100644 --- a/tests/bluetooth/controller/ctrl_encrypt/prj.conf +++ b/tests/bluetooth/controller/ctrl_encrypt/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_feature_exchange/prj.conf b/tests/bluetooth/controller/ctrl_feature_exchange/prj.conf index a7d8ebfd28a..91efec95088 100644 --- a/tests/bluetooth/controller/ctrl_feature_exchange/prj.conf +++ b/tests/bluetooth/controller/ctrl_feature_exchange/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_hci/prj.conf b/tests/bluetooth/controller/ctrl_hci/prj.conf index 89c01eed822..69338414888 100644 --- a/tests/bluetooth/controller/ctrl_hci/prj.conf +++ b/tests/bluetooth/controller/ctrl_hci/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_invalid/prj.conf b/tests/bluetooth/controller/ctrl_invalid/prj.conf index be14c4efa44..29810875d88 100644 --- a/tests/bluetooth/controller/ctrl_invalid/prj.conf +++ b/tests/bluetooth/controller/ctrl_invalid/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_le_ping/prj.conf b/tests/bluetooth/controller/ctrl_le_ping/prj.conf index be14c4efa44..29810875d88 100644 --- a/tests/bluetooth/controller/ctrl_le_ping/prj.conf +++ b/tests/bluetooth/controller/ctrl_le_ping/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_min_used_chans/prj.conf b/tests/bluetooth/controller/ctrl_min_used_chans/prj.conf index be14c4efa44..29810875d88 100644 --- a/tests/bluetooth/controller/ctrl_min_used_chans/prj.conf +++ b/tests/bluetooth/controller/ctrl_min_used_chans/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_periodic_sync/prj.conf b/tests/bluetooth/controller/ctrl_periodic_sync/prj.conf index 91c4ef94c2f..766d7faf388 100644 --- a/tests/bluetooth/controller/ctrl_periodic_sync/prj.conf +++ b/tests/bluetooth/controller/ctrl_periodic_sync/prj.conf @@ -6,9 +6,7 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y CONFIG_BT_CTLR_PRIVACY=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_phy_update/prj.conf b/tests/bluetooth/controller/ctrl_phy_update/prj.conf index be14c4efa44..29810875d88 100644 --- a/tests/bluetooth/controller/ctrl_phy_update/prj.conf +++ b/tests/bluetooth/controller/ctrl_phy_update/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_phy_update/prj_rx_cnt.conf b/tests/bluetooth/controller/ctrl_phy_update/prj_rx_cnt.conf index 3ad2c76bc78..fe68ba59246 100644 --- a/tests/bluetooth/controller/ctrl_phy_update/prj_rx_cnt.conf +++ b/tests/bluetooth/controller/ctrl_phy_update/prj_rx_cnt.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_sca_update/prj.conf b/tests/bluetooth/controller/ctrl_sca_update/prj.conf index be14c4efa44..29810875d88 100644 --- a/tests/bluetooth/controller/ctrl_sca_update/prj.conf +++ b/tests/bluetooth/controller/ctrl_sca_update/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_sw_privacy/prj.conf b/tests/bluetooth/controller/ctrl_sw_privacy/prj.conf index 7324043fdbd..3d7ac6cd830 100644 --- a/tests/bluetooth/controller/ctrl_sw_privacy/prj.conf +++ b/tests/bluetooth/controller/ctrl_sw_privacy/prj.conf @@ -1,6 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/controller/ctrl_terminate/prj.conf b/tests/bluetooth/controller/ctrl_terminate/prj.conf index be14c4efa44..29810875d88 100644 --- a/tests/bluetooth/controller/ctrl_terminate/prj.conf +++ b/tests/bluetooth/controller/ctrl_terminate/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj.conf b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj.conf index a10bddb77fe..48779e2f9f7 100644 --- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj.conf +++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_1.conf b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_1.conf index 7c8cc3db039..2490e3630e4 100644 --- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_1.conf +++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_1.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_2.conf b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_2.conf index 5172998ddd4..6a671e13467 100644 --- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_2.conf +++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_2.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_3.conf b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_3.conf index 78ca4237124..9bc448ca80d 100644 --- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_3.conf +++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_3.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_max.conf b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_max.conf index f6ecf7bb959..2d6180ecb77 100644 --- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_max.conf +++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_max.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_max_common.conf b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_max_common.conf index 56b7f7a3bef..85151e12181 100644 --- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_max_common.conf +++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_max_common.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_tx_queue/prj.conf b/tests/bluetooth/controller/ctrl_tx_queue/prj.conf index be14c4efa44..29810875d88 100644 --- a/tests/bluetooth/controller/ctrl_tx_queue/prj.conf +++ b/tests/bluetooth/controller/ctrl_tx_queue/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_unsupported/prj.conf b/tests/bluetooth/controller/ctrl_unsupported/prj.conf index be14c4efa44..29810875d88 100644 --- a/tests/bluetooth/controller/ctrl_unsupported/prj.conf +++ b/tests/bluetooth/controller/ctrl_unsupported/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_unsupported/prj_unsupported.conf b/tests/bluetooth/controller/ctrl_unsupported/prj_unsupported.conf index 714279ebba3..cad12be55ec 100644 --- a/tests/bluetooth/controller/ctrl_unsupported/prj_unsupported.conf +++ b/tests/bluetooth/controller/ctrl_unsupported/prj_unsupported.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ctrl_user_ext/prj.conf b/tests/bluetooth/controller/ctrl_user_ext/prj.conf index d254da34fba..507168cbfc8 100644 --- a/tests/bluetooth/controller/ctrl_user_ext/prj.conf +++ b/tests/bluetooth/controller/ctrl_user_ext/prj.conf @@ -1,6 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/controller/ctrl_version/prj.conf b/tests/bluetooth/controller/ctrl_version/prj.conf index be14c4efa44..29810875d88 100644 --- a/tests/bluetooth/controller/ctrl_version/prj.conf +++ b/tests/bluetooth/controller/ctrl_version/prj.conf @@ -7,8 +7,6 @@ CONFIG_ASSERT_VERBOSE=y CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LLL_VENDOR_NORDIC=y diff --git a/tests/bluetooth/controller/ll_settings/prj.conf b/tests/bluetooth/controller/ll_settings/prj.conf index ab133036bf9..39a68d30a10 100644 --- a/tests/bluetooth/controller/ll_settings/prj.conf +++ b/tests/bluetooth/controller/ll_settings/prj.conf @@ -2,7 +2,6 @@ CONFIG_TEST=y CONFIG_ZTEST=y CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y diff --git a/tests/bluetooth/df/connection_cte_req/prj.conf b/tests/bluetooth/df/connection_cte_req/prj.conf index 77d3260135d..3a36f8893e8 100644 --- a/tests/bluetooth/df/connection_cte_req/prj.conf +++ b/tests/bluetooth/df/connection_cte_req/prj.conf @@ -7,9 +7,6 @@ CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y CONFIG_BT_GATT_CLIENT=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y - # Enable Direction Finding Feature including AoA and AoD CONFIG_BT_DF=y CONFIG_BT_CTLR_DF_CTE_RX=y diff --git a/tests/bluetooth/df/connection_cte_tx_params/prj.conf b/tests/bluetooth/df/connection_cte_tx_params/prj.conf index 162d6ba6b77..c186880d8dd 100644 --- a/tests/bluetooth/df/connection_cte_tx_params/prj.conf +++ b/tests/bluetooth/df/connection_cte_tx_params/prj.conf @@ -6,9 +6,6 @@ CONFIG_BT=y # Each of these roles selects BT_CONN. CONFIG_BT_CENTRAL=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y - # Enable Direction Finding Feature including AoA and AoD CONFIG_BT_DF=y CONFIG_BT_CTLR_DF=y diff --git a/tests/bluetooth/df/connectionless_cte_chains/prj.conf b/tests/bluetooth/df/connectionless_cte_chains/prj.conf index 45e5534c44d..01973b9ed80 100644 --- a/tests/bluetooth/df/connectionless_cte_chains/prj.conf +++ b/tests/bluetooth/df/connectionless_cte_chains/prj.conf @@ -5,7 +5,6 @@ CONFIG_BT=y CONFIG_BT_EXT_ADV=y CONFIG_BT_PER_ADV=y -CONFIG_BT_CTLR=y CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_ADV_PERIODIC=y CONFIG_BT_CTLR_DF=y diff --git a/tests/bluetooth/df/connectionless_cte_rx/prj.conf b/tests/bluetooth/df/connectionless_cte_rx/prj.conf index 4d2cb06c548..c3f00068035 100644 --- a/tests/bluetooth/df/connectionless_cte_rx/prj.conf +++ b/tests/bluetooth/df/connectionless_cte_rx/prj.conf @@ -5,7 +5,6 @@ CONFIG_BT=y CONFIG_BT_EXT_ADV=y CONFIG_BT_PER_ADV=y -CONFIG_BT_CTLR=y CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_SYNC_PERIODIC=y CONFIG_BT_CTLR_DF=y diff --git a/tests/bluetooth/df/connectionless_cte_tx/prj.conf b/tests/bluetooth/df/connectionless_cte_tx/prj.conf index 6f215ed07fb..dcf1ee0f574 100644 --- a/tests/bluetooth/df/connectionless_cte_tx/prj.conf +++ b/tests/bluetooth/df/connectionless_cte_tx/prj.conf @@ -5,7 +5,6 @@ CONFIG_BT=y CONFIG_BT_EXT_ADV=y CONFIG_BT_PER_ADV=y -CONFIG_BT_CTLR=y CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_ADV_PERIODIC=y diff --git a/tests/bluetooth/gatt/prj.conf b/tests/bluetooth/gatt/prj.conf index 88706f76035..f9a648278e4 100644 --- a/tests/bluetooth/gatt/prj.conf +++ b/tests/bluetooth/gatt/prj.conf @@ -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 CONFIG_LOG=y diff --git a/tests/bluetooth/hci/prj.conf b/tests/bluetooth/hci/prj.conf index ef2dc42fc03..b19543cd4f9 100644 --- a/tests/bluetooth/hci/prj.conf +++ b/tests/bluetooth/hci/prj.conf @@ -3,6 +3,6 @@ CONFIG_ZTEST=y CONFIG_BT=y CONFIG_BT_HCI_ERR_TO_STR=y -CONFIG_BT_CTLR=n +CONFIG_BT_LL_SW_SPLIT=n CONFIG_BT_H4=n CONFIG_BT_HCI_ERR_TO_STR=y diff --git a/tests/bluetooth/hci_codecs_info/prj.conf b/tests/bluetooth/hci_codecs_info/prj.conf index 316132fffc1..cd99cdd157c 100644 --- a/tests/bluetooth/hci_codecs_info/prj.conf +++ b/tests/bluetooth/hci_codecs_info/prj.conf @@ -2,6 +2,5 @@ CONFIG_TEST=y CONFIG_ZTEST=y CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_CTLR_HCI_CODEC_AND_DELAY_INFO=y diff --git a/tests/bluetooth/hci_prop_evt/prj.conf b/tests/bluetooth/hci_prop_evt/prj.conf index 5d87f13964c..1c44d386ae2 100644 --- a/tests/bluetooth/hci_prop_evt/prj.conf +++ b/tests/bluetooth/hci_prop_evt/prj.conf @@ -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 CONFIG_BT_HCI_VS_EVT_USER=y diff --git a/tests/bluetooth/host_long_adv_recv/prj.conf b/tests/bluetooth/host_long_adv_recv/prj.conf index 96c30582c50..9a1a229165b 100644 --- a/tests/bluetooth/host_long_adv_recv/prj.conf +++ b/tests/bluetooth/host_long_adv_recv/prj.conf @@ -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 CONFIG_BT_HCI=n CONFIG_BT_HCI_RAW=n diff --git a/tests/bluetooth/init/prj_ctlr.conf b/tests/bluetooth/init/prj_ctlr.conf index 2c437948782..8062b929965 100644 --- a/tests/bluetooth/init/prj_ctlr.conf +++ b/tests/bluetooth/init/prj_ctlr.conf @@ -1,6 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_HCI_ACL_FLOW_CONTROL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y diff --git a/tests/bluetooth/init/prj_ctlr_4_0.conf b/tests/bluetooth/init/prj_ctlr_4_0.conf index ba2013915d1..98dcaaa746c 100644 --- a/tests/bluetooth/init/prj_ctlr_4_0.conf +++ b/tests/bluetooth/init/prj_ctlr_4_0.conf @@ -1,6 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_CTLR_DUP_FILTER_LEN=16 CONFIG_BT_CTLR_CONN_PARAM_REQ=n CONFIG_BT_CTLR_LE_PING=n diff --git a/tests/bluetooth/init/prj_ctlr_4_0_dbg.conf b/tests/bluetooth/init/prj_ctlr_4_0_dbg.conf index 372d4a29010..476213c8273 100644 --- a/tests/bluetooth/init/prj_ctlr_4_0_dbg.conf +++ b/tests/bluetooth/init/prj_ctlr_4_0_dbg.conf @@ -1,6 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_CTLR_DUP_FILTER_LEN=16 CONFIG_BT_CTLR_CONN_PARAM_REQ=n CONFIG_BT_CTLR_LE_PING=n diff --git a/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf b/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf index b244d14dd03..90a7fbcd19d 100644 --- a/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf +++ b/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf @@ -1,6 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_CTLR_DUP_FILTER_LEN=16 CONFIG_BT_CTLR_CONN_PARAM_REQ=y CONFIG_BT_CTLR_LE_PING=y diff --git a/tests/bluetooth/init/prj_ctlr_broadcaster.conf b/tests/bluetooth/init/prj_ctlr_broadcaster.conf index d062716f66b..79b54cb83c7 100644 --- a/tests/bluetooth/init/prj_ctlr_broadcaster.conf +++ b/tests/bluetooth/init/prj_ctlr_broadcaster.conf @@ -1,10 +1,8 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=y CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=n CONFIG_BT_CENTRAL=n CONFIG_BT_EXT_ADV=n CONFIG_BT_CTLR_ADV_EXT=n -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_broadcaster_ext.conf b/tests/bluetooth/init/prj_ctlr_broadcaster_ext.conf index 389e622135d..db0804ac8a2 100644 --- a/tests/bluetooth/init/prj_ctlr_broadcaster_ext.conf +++ b/tests/bluetooth/init/prj_ctlr_broadcaster_ext.conf @@ -1,10 +1,8 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=y CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=n CONFIG_BT_CENTRAL=n CONFIG_BT_EXT_ADV=y CONFIG_BT_CTLR_ADV_EXT=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_broadcaster_iso.conf b/tests/bluetooth/init/prj_ctlr_broadcaster_iso.conf index cd6f57dd75c..0ced362e578 100644 --- a/tests/bluetooth/init/prj_ctlr_broadcaster_iso.conf +++ b/tests/bluetooth/init/prj_ctlr_broadcaster_iso.conf @@ -1,11 +1,9 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=y CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=n CONFIG_BT_CENTRAL=n CONFIG_BT_EXT_ADV=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_ADV_ISO=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_central.conf b/tests/bluetooth/init/prj_ctlr_central.conf index f00fe35ea64..8ef713f798f 100644 --- a/tests/bluetooth/init/prj_ctlr_central.conf +++ b/tests/bluetooth/init/prj_ctlr_central.conf @@ -1,10 +1,8 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=n CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=y CONFIG_BT_CENTRAL=y CONFIG_BT_EXT_ADV=n CONFIG_BT_CTLR_ADV_EXT=n -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_central_ext.conf b/tests/bluetooth/init/prj_ctlr_central_ext.conf index 4508d629e35..e399d1d9dcb 100644 --- a/tests/bluetooth/init/prj_ctlr_central_ext.conf +++ b/tests/bluetooth/init/prj_ctlr_central_ext.conf @@ -1,10 +1,8 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=n CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=y CONFIG_BT_CENTRAL=y CONFIG_BT_EXT_ADV=y CONFIG_BT_CTLR_ADV_EXT=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_central_ext_priv.conf b/tests/bluetooth/init/prj_ctlr_central_ext_priv.conf index 59f8a46addb..9f1328f3f76 100644 --- a/tests/bluetooth/init/prj_ctlr_central_ext_priv.conf +++ b/tests/bluetooth/init/prj_ctlr_central_ext_priv.conf @@ -1,5 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=n CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=y @@ -8,5 +7,4 @@ CONFIG_BT_SMP=y CONFIG_BT_PRIVACY=y CONFIG_BT_EXT_ADV=y CONFIG_BT_CTLR_ADV_EXT=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_central_iso.conf b/tests/bluetooth/init/prj_ctlr_central_iso.conf index ad23e1c6675..7e3f1b3210e 100644 --- a/tests/bluetooth/init/prj_ctlr_central_iso.conf +++ b/tests/bluetooth/init/prj_ctlr_central_iso.conf @@ -1,7 +1,5 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_CENTRAL=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_ISO_CENTRAL=y CONFIG_BT_CTLR_CENTRAL_ISO=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_central_priv.conf b/tests/bluetooth/init/prj_ctlr_central_priv.conf index 3bf4650f1e7..3ee7513aa64 100644 --- a/tests/bluetooth/init/prj_ctlr_central_priv.conf +++ b/tests/bluetooth/init/prj_ctlr_central_priv.conf @@ -1,5 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=n CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=y @@ -8,5 +7,4 @@ CONFIG_BT_SMP=y CONFIG_BT_PRIVACY=y CONFIG_BT_EXT_ADV=n CONFIG_BT_CTLR_ADV_EXT=n -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_dbg.conf b/tests/bluetooth/init/prj_ctlr_dbg.conf index 19dda6f9b82..bd88daf7fd3 100644 --- a/tests/bluetooth/init/prj_ctlr_dbg.conf +++ b/tests/bluetooth/init/prj_ctlr_dbg.conf @@ -1,6 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_CTLR_DUP_FILTER_LEN=16 CONFIG_BT_CTLR_CONN_PARAM_REQ=y CONFIG_BT_CTLR_LE_PING=y diff --git a/tests/bluetooth/init/prj_ctlr_observer.conf b/tests/bluetooth/init/prj_ctlr_observer.conf index 96d1d2d8edb..64683b59d00 100644 --- a/tests/bluetooth/init/prj_ctlr_observer.conf +++ b/tests/bluetooth/init/prj_ctlr_observer.conf @@ -1,10 +1,8 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=n CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=y CONFIG_BT_CENTRAL=n CONFIG_BT_EXT_ADV=n CONFIG_BT_CTLR_ADV_EXT=n -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_observer_ext.conf b/tests/bluetooth/init/prj_ctlr_observer_ext.conf index 4d540d59f25..1a20715b75e 100644 --- a/tests/bluetooth/init/prj_ctlr_observer_ext.conf +++ b/tests/bluetooth/init/prj_ctlr_observer_ext.conf @@ -1,10 +1,8 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=n CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=y CONFIG_BT_CENTRAL=n CONFIG_BT_EXT_ADV=y CONFIG_BT_CTLR_ADV_EXT=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_per_adv.conf b/tests/bluetooth/init/prj_ctlr_per_adv.conf index c070838fc06..9b67724dfac 100644 --- a/tests/bluetooth/init/prj_ctlr_per_adv.conf +++ b/tests/bluetooth/init/prj_ctlr_per_adv.conf @@ -1,5 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=y CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=n @@ -9,5 +8,4 @@ CONFIG_BT_PER_ADV=y CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_ADV_PERIODIC=y CONFIG_BT_CTLR_ADV_PERIODIC_ADI_SUPPORT=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_per_adv_no_adi.conf b/tests/bluetooth/init/prj_ctlr_per_adv_no_adi.conf index e2bd0cc711c..3bdd08e9e0a 100644 --- a/tests/bluetooth/init/prj_ctlr_per_adv_no_adi.conf +++ b/tests/bluetooth/init/prj_ctlr_per_adv_no_adi.conf @@ -1,5 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=y CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=n @@ -9,5 +8,4 @@ CONFIG_BT_PER_ADV=y CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_ADV_PERIODIC=y CONFIG_BT_CTLR_ADV_PERIODIC_ADI_SUPPORT=n -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_per_sync.conf b/tests/bluetooth/init/prj_ctlr_per_sync.conf index 60142f55adc..175e0105eec 100644 --- a/tests/bluetooth/init/prj_ctlr_per_sync.conf +++ b/tests/bluetooth/init/prj_ctlr_per_sync.conf @@ -1,5 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=n CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=y @@ -10,5 +9,4 @@ CONFIG_BT_CTLR_DUP_FILTER_LEN=16 CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_SYNC_PERIODIC=y CONFIG_BT_CTLR_SYNC_PERIODIC_ADI_SUPPORT=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_per_sync_no_adi.conf b/tests/bluetooth/init/prj_ctlr_per_sync_no_adi.conf index c2e9ce0defc..3efb70583fd 100644 --- a/tests/bluetooth/init/prj_ctlr_per_sync_no_adi.conf +++ b/tests/bluetooth/init/prj_ctlr_per_sync_no_adi.conf @@ -1,5 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=n CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=y @@ -10,5 +9,4 @@ CONFIG_BT_CTLR_DUP_FILTER_LEN=16 CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_SYNC_PERIODIC=y CONFIG_BT_CTLR_SYNC_PERIODIC_ADI_SUPPORT=n -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_per_sync_no_filter.conf b/tests/bluetooth/init/prj_ctlr_per_sync_no_filter.conf index 62b952a7e89..76d5b8e4cbc 100644 --- a/tests/bluetooth/init/prj_ctlr_per_sync_no_filter.conf +++ b/tests/bluetooth/init/prj_ctlr_per_sync_no_filter.conf @@ -1,5 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=n CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=y @@ -10,5 +9,4 @@ CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_SYNC_PERIODIC=y CONFIG_BT_CTLR_SYNC_PERIODIC_ADI_SUPPORT=n -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_peripheral.conf b/tests/bluetooth/init/prj_ctlr_peripheral.conf index 3a41b00e864..d321ea16600 100644 --- a/tests/bluetooth/init/prj_ctlr_peripheral.conf +++ b/tests/bluetooth/init/prj_ctlr_peripheral.conf @@ -1,10 +1,8 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_OBSERVER=n CONFIG_BT_CENTRAL=n CONFIG_BT_EXT_ADV=n CONFIG_BT_CTLR_ADV_EXT=n -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_peripheral_ext.conf b/tests/bluetooth/init/prj_ctlr_peripheral_ext.conf index 9f1b6919aa9..10870b73526 100644 --- a/tests/bluetooth/init/prj_ctlr_peripheral_ext.conf +++ b/tests/bluetooth/init/prj_ctlr_peripheral_ext.conf @@ -1,10 +1,8 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_OBSERVER=n CONFIG_BT_CENTRAL=n CONFIG_BT_EXT_ADV=y CONFIG_BT_CTLR_ADV_EXT=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_peripheral_ext_priv.conf b/tests/bluetooth/init/prj_ctlr_peripheral_ext_priv.conf index e0c3f9487c0..054ee989e7f 100644 --- a/tests/bluetooth/init/prj_ctlr_peripheral_ext_priv.conf +++ b/tests/bluetooth/init/prj_ctlr_peripheral_ext_priv.conf @@ -1,5 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_OBSERVER=n @@ -8,5 +7,4 @@ CONFIG_BT_SMP=y CONFIG_BT_PRIVACY=y CONFIG_BT_EXT_ADV=y CONFIG_BT_CTLR_ADV_EXT=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_peripheral_iso.conf b/tests/bluetooth/init/prj_ctlr_peripheral_iso.conf index c2e3ca23a5b..61bed01ad82 100644 --- a/tests/bluetooth/init/prj_ctlr_peripheral_iso.conf +++ b/tests/bluetooth/init/prj_ctlr_peripheral_iso.conf @@ -2,8 +2,6 @@ CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_ISO_PERIPHERAL=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_CTLR_PERIPHERAL_ISO=y CONFIG_BT_CTLR_ADVANCED_FEATURES=y diff --git a/tests/bluetooth/init/prj_ctlr_peripheral_priv.conf b/tests/bluetooth/init/prj_ctlr_peripheral_priv.conf index 9175c302272..3ca235be361 100644 --- a/tests/bluetooth/init/prj_ctlr_peripheral_priv.conf +++ b/tests/bluetooth/init/prj_ctlr_peripheral_priv.conf @@ -1,5 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_OBSERVER=n @@ -8,5 +7,4 @@ CONFIG_BT_SMP=y CONFIG_BT_PRIVACY=y CONFIG_BT_EXT_ADV=n CONFIG_BT_CTLR_ADV_EXT=n -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_sync_iso.conf b/tests/bluetooth/init/prj_ctlr_sync_iso.conf index c61443085e1..1712d1c442b 100644 --- a/tests/bluetooth/init/prj_ctlr_sync_iso.conf +++ b/tests/bluetooth/init/prj_ctlr_sync_iso.conf @@ -1,5 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y CONFIG_BT_BROADCASTER=n CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=y @@ -9,5 +8,4 @@ CONFIG_BT_PER_ADV_SYNC=y CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_SYNC_PERIODIC=y CONFIG_BT_CTLR_SYNC_ISO=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr_ticker.conf b/tests/bluetooth/init/prj_ctlr_ticker.conf index d2b4d31692e..3e06ff5c68d 100644 --- a/tests/bluetooth/init/prj_ctlr_ticker.conf +++ b/tests/bluetooth/init/prj_ctlr_ticker.conf @@ -1,6 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_CTLR_DUP_FILTER_LEN=16 CONFIG_BT_CTLR_CONN_PARAM_REQ=y CONFIG_BT_CTLR_LE_PING=y diff --git a/tests/bluetooth/init/prj_ctlr_tiny.conf b/tests/bluetooth/init/prj_ctlr_tiny.conf index 7cffa215307..5bc0aa5a6b4 100644 --- a/tests/bluetooth/init/prj_ctlr_tiny.conf +++ b/tests/bluetooth/init/prj_ctlr_tiny.conf @@ -1,6 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_CTLR_CONN_PARAM_REQ=n CONFIG_BT_CTLR_EXT_REJ_IND=n diff --git a/tests/bluetooth/init/prj_llcp.conf b/tests/bluetooth/init/prj_llcp.conf index 33dc3aff1a1..8542a4e2f20 100644 --- a/tests/bluetooth/init/prj_llcp.conf +++ b/tests/bluetooth/init/prj_llcp.conf @@ -1,6 +1,4 @@ CONFIG_BT=y -CONFIG_BT_CTLR=y -CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_HCI_ACL_FLOW_CONTROL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y diff --git a/tests/bluetooth/l2cap/prj.conf b/tests/bluetooth/l2cap/prj.conf index ace0bc553f4..4c76623d79c 100644 --- a/tests/bluetooth/l2cap/prj.conf +++ b/tests/bluetooth/l2cap/prj.conf @@ -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 CONFIG_LOG=y diff --git a/tests/bluetooth/shell/testcase.yaml b/tests/bluetooth/shell/testcase.yaml index 6db24ccc0e5..a7e4c13aeee 100644 --- a/tests/bluetooth/shell/testcase.yaml +++ b/tests/bluetooth/shell/testcase.yaml @@ -22,23 +22,23 @@ tests: bluetooth.shell.power_control_request: extra_configs: - CONFIG_BT_TRANSMIT_POWER_CONTROL=y - - CONFIG_BT_CTLR=n + - CONFIG_BT_LL_SW_SPLIT=n build_only: true bluetooth.shell.path_loss_monitoring: extra_configs: - CONFIG_BT_PATH_LOSS_MONITORING=y - - CONFIG_BT_CTLR=n + - CONFIG_BT_LL_SW_SPLIT=n build_only: true bluetooth.shell.subrating: extra_configs: - CONFIG_BT_SUBRATING=y - - CONFIG_BT_CTLR=n + - CONFIG_BT_LL_SW_SPLIT=n build_only: true bluetooth.shell.channel_sounding: extra_configs: - CONFIG_BT_CHANNEL_SOUNDING=y - CONFIG_BT_CHANNEL_SOUNDING_TEST=y - - CONFIG_BT_CTLR=n + - CONFIG_BT_LL_SW_SPLIT=n build_only: true bluetooth.shell.cdc_acm: extra_args: diff --git a/tests/bluetooth/smp/prj.conf b/tests/bluetooth/smp/prj.conf index 0b6afd9a57b..31982a69eab 100644 --- a/tests/bluetooth/smp/prj.conf +++ b/tests/bluetooth/smp/prj.conf @@ -3,7 +3,7 @@ CONFIG_ZTEST=y CONFIG_BT=y CONFIG_BT_SMP=y -CONFIG_BT_CTLR=n +CONFIG_BT_LL_SW_SPLIT=n CONFIG_BT_H4=n CONFIG_LOG=y diff --git a/tests/bluetooth/uuid/prj.conf b/tests/bluetooth/uuid/prj.conf index 1f86a43c208..807ba6ae741 100644 --- a/tests/bluetooth/uuid/prj.conf +++ b/tests/bluetooth/uuid/prj.conf @@ -2,5 +2,5 @@ CONFIG_TEST=y CONFIG_ZTEST=y CONFIG_BT=y -CONFIG_BT_CTLR=n +CONFIG_BT_LL_SW_SPLIT=n CONFIG_BT_H4=n diff --git a/tests/bsim/bluetooth/ll/conn/prj_split_hci_uart.conf b/tests/bsim/bluetooth/ll/conn/prj_split_hci_uart.conf index 4c39731af6a..326cb04c468 100644 --- a/tests/bsim/bluetooth/ll/conn/prj_split_hci_uart.conf +++ b/tests/bsim/bluetooth/ll/conn/prj_split_hci_uart.conf @@ -14,4 +14,4 @@ CONFIG_BT_DEVICE_NAME="bsim_test_split_hci_uart" CONFIG_BT_L2CAP_TX_BUF_COUNT=6 CONFIG_BT_HCI=y -CONFIG_BT_CTLR=n +CONFIG_BT_LL_SW_SPLIT=n diff --git a/tests/bsim/bluetooth/ll/edtt/gatt_test_app/prj_llcp.conf b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/prj_llcp.conf index cf1e71513c9..94464bdf43f 100644 --- a/tests/bsim/bluetooth/ll/edtt/gatt_test_app/prj_llcp.conf +++ b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/prj_llcp.conf @@ -11,8 +11,6 @@ CONFIG_BT_DEVICE_NAME="Test Database" CONFIG_BT_DEVICE_APPEARANCE=833 CONFIG_BT_GATT_DYNAMIC_DB=y -CONFIG_BT_CTLR=y - CONFIG_BT_HCI_ACL_FLOW_CONTROL=y CONFIG_BT_BUF_ACL_RX_SIZE=516 CONFIG_BT_L2CAP_TX_MTU=512 diff --git a/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_dut_llcp.conf b/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_dut_llcp.conf index b734a6cbbc3..981986ebd2c 100644 --- a/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_dut_llcp.conf +++ b/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_dut_llcp.conf @@ -14,8 +14,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=60 CONFIG_BT_BUF_ACL_TX_SIZE=60 CONFIG_BT_BUF_CMD_TX_SIZE=255 -CONFIG_BT_CTLR=y - CONFIG_BT_CTLR_CRYPTO=y CONFIG_BT_CTLR_LE_ENC=y CONFIG_BT_CTLR_PRIVACY=y diff --git a/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_tst_llcp.conf b/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_tst_llcp.conf index e904af2a277..b1eb9a86f93 100644 --- a/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_tst_llcp.conf +++ b/tests/bsim/bluetooth/ll/edtt/hci_test_app/prj_tst_llcp.conf @@ -12,8 +12,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=60 CONFIG_BT_BUF_ACL_TX_SIZE=60 CONFIG_BT_BUF_CMD_TX_SIZE=255 -CONFIG_BT_CTLR=y - CONFIG_BT_CTLR_CRYPTO=y CONFIG_BT_CTLR_LE_ENC=y CONFIG_BT_CTLR_PRIVACY=y