From 6c7ed9627eddbe445683f73da4cb2b071cd8dbfc Mon Sep 17 00:00:00 2001 From: Rubin Gerritsen Date: Sun, 12 Jul 2020 15:02:24 +0200 Subject: [PATCH] bluetooth: controller: Kconfig: Move LLL selection to split config The dependency to LL_SPLIT is removed. Signed-off-by: Rubin Gerritsen --- subsys/bluetooth/controller/Kconfig | 42 ------------------- .../bluetooth/controller/Kconfig.ll_sw_split | 42 +++++++++++++++++++ 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index 6f28e76f66d..6b0c676d99d 100644 --- a/subsys/bluetooth/controller/Kconfig +++ b/subsys/bluetooth/controller/Kconfig @@ -73,48 +73,6 @@ config BT_LL_SW_SPLIT endchoice -config BT_LLL_VENDOR_NORDIC - bool "Use Nordic LLL" - depends on BT_LL_SW_SPLIT && SOC_COMPATIBLE_NRF - select BT_HAS_HCI_VS - select ENTROPY_NRF5_RNG - select ENTROPY_NRF5_BIAS_CORRECTION - select BT_CTLR_LE_ENC_SUPPORT if !BT_CTLR_DATA_LENGTH_CLEAR && \ - !BT_CTLR_PHY_2M_NRF - select BT_CTLR_CONN_PARAM_REQ_SUPPORT - select BT_CTLR_EXT_REJ_IND_SUPPORT - select BT_CTLR_SLAVE_FEAT_REQ_SUPPORT - select BT_CTLR_DATA_LEN_UPDATE_SUPPORT if !SOC_SERIES_NRF51X || \ - BT_CTLR_DATA_LENGTH_CLEAR - select BT_CTLR_PRIVACY_SUPPORT if !SOC_SERIES_NRF51X - select BT_CTLR_EXT_SCAN_FP_SUPPORT - select BT_CTLR_PHY_UPDATE_SUPPORT if !SOC_SERIES_NRF51X || \ - BT_CTLR_PHY_2M_NRF - select BT_CTLR_ADV_EXT_SUPPORT - select BT_CTLR_ADV_PERIODIC_SUPPORT - select BT_CTLR_CHAN_SEL_2_SUPPORT - select BT_CTLR_MIN_USED_CHAN_SUPPORT - select BT_CTLR_DTM_HCI_SUPPORT - - select BT_CTLR_XTAL_ADVANCED_SUPPORT - select BT_CTLR_SCHED_ADVANCED_SUPPORT - select BT_CTLR_TIFS_HW_SUPPORT - default y - help - Use Nordic Lower Link Layer implementation. - -config BT_LLL_VENDOR_OPENISA - bool "Use OpenISA LLL" - depends on BT_LL_SW_SPLIT && SOC_OPENISA_RV32M1_RISCV32 - select BT_CTLR_PHY_UPDATE_SUPPORT - select BT_CTLR_EXT_REJ_IND_SUPPORT - select BT_HAS_HCI_VS - select BT_CTLR_LE_ENC_SUPPORT if !BT_CTLR_DATA_LENGTH_CLEAR - select BT_CTLR_PRIVACY_SUPPORT - default y - help - Use OpenISA Lower Link Layer implementation. - comment "BLE Controller configuration" config BT_CTLR_CRYPTO diff --git a/subsys/bluetooth/controller/Kconfig.ll_sw_split b/subsys/bluetooth/controller/Kconfig.ll_sw_split index 6549f8eee6d..9ed2eca3a67 100644 --- a/subsys/bluetooth/controller/Kconfig.ll_sw_split +++ b/subsys/bluetooth/controller/Kconfig.ll_sw_split @@ -5,6 +5,48 @@ if BT_LL_SW_SPLIT +config BT_LLL_VENDOR_NORDIC + bool "Use Nordic LLL" + depends on SOC_COMPATIBLE_NRF + select BT_HAS_HCI_VS + select ENTROPY_NRF5_RNG + select ENTROPY_NRF5_BIAS_CORRECTION + select BT_CTLR_LE_ENC_SUPPORT if !BT_CTLR_DATA_LENGTH_CLEAR && \ + !BT_CTLR_PHY_2M_NRF + select BT_CTLR_CONN_PARAM_REQ_SUPPORT + select BT_CTLR_EXT_REJ_IND_SUPPORT + select BT_CTLR_SLAVE_FEAT_REQ_SUPPORT + select BT_CTLR_DATA_LEN_UPDATE_SUPPORT if !SOC_SERIES_NRF51X || \ + BT_CTLR_DATA_LENGTH_CLEAR + select BT_CTLR_PRIVACY_SUPPORT if !SOC_SERIES_NRF51X + select BT_CTLR_EXT_SCAN_FP_SUPPORT + select BT_CTLR_PHY_UPDATE_SUPPORT if !SOC_SERIES_NRF51X || \ + BT_CTLR_PHY_2M_NRF + select BT_CTLR_ADV_EXT_SUPPORT + select BT_CTLR_ADV_PERIODIC_SUPPORT + select BT_CTLR_CHAN_SEL_2_SUPPORT + select BT_CTLR_MIN_USED_CHAN_SUPPORT + select BT_CTLR_DTM_HCI_SUPPORT + + select BT_CTLR_XTAL_ADVANCED_SUPPORT + select BT_CTLR_SCHED_ADVANCED_SUPPORT + select BT_CTLR_TIFS_HW_SUPPORT + default y + help + Use Nordic Lower Link Layer implementation. + +config BT_LLL_VENDOR_OPENISA + bool "Use OpenISA LLL" + depends on SOC_OPENISA_RV32M1_RISCV32 + select BT_CTLR_PHY_UPDATE_SUPPORT + select BT_CTLR_EXT_REJ_IND_SUPPORT + select BT_HAS_HCI_VS + select BT_CTLR_LE_ENC_SUPPORT if !BT_CTLR_DATA_LENGTH_CLEAR + select BT_CTLR_PRIVACY_SUPPORT + default y + help + Use OpenISA Lower Link Layer implementation. + config BT_CTLR_XTAL_ADVANCED_SUPPORT bool