diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index 25f480788e14ef..9de6a99eeaa597 100644 --- a/subsys/bluetooth/controller/Kconfig +++ b/subsys/bluetooth/controller/Kconfig @@ -138,6 +138,7 @@ choice BT_LL_CHOICE config BT_LL_SW_SPLIT bool "Software-based BLE Link Layer" + depends on DT_HAS_ZEPHYR_BT_HCI_LL_SW_SPLIT_ENABLED help Use Zephyr software BLE Link Layer ULL LLL split implementation. diff --git a/tests/bluetooth/controller/common/Kconfig b/tests/bluetooth/controller/common/Kconfig new file mode 100644 index 00000000000000..88adbd370c5528 --- /dev/null +++ b/tests/bluetooth/controller/common/Kconfig @@ -0,0 +1,9 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +# The link layer requires a corresponding device tree node to be enabled +# The corresponding Kconfig entry is not generated for unit tests, +# so we add it here. +config DT_HAS_ZEPHYR_BT_HCI_LL_SW_SPLIT_ENABLED + bool + default y diff --git a/tests/bluetooth/controller/ctrl_api/Kconfig b/tests/bluetooth/controller/ctrl_api/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_api/Kconfig +++ b/tests/bluetooth/controller/ctrl_api/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_chmu/Kconfig b/tests/bluetooth/controller/ctrl_chmu/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_chmu/Kconfig +++ b/tests/bluetooth/controller/ctrl_chmu/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_cis_create/Kconfig b/tests/bluetooth/controller/ctrl_cis_create/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_cis_create/Kconfig +++ b/tests/bluetooth/controller/ctrl_cis_create/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_cis_terminate/Kconfig b/tests/bluetooth/controller/ctrl_cis_terminate/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_cis_terminate/Kconfig +++ b/tests/bluetooth/controller/ctrl_cis_terminate/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_collision/Kconfig b/tests/bluetooth/controller/ctrl_collision/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_collision/Kconfig +++ b/tests/bluetooth/controller/ctrl_collision/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_conn_update/Kconfig b/tests/bluetooth/controller/ctrl_conn_update/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_conn_update/Kconfig +++ b/tests/bluetooth/controller/ctrl_conn_update/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_cte_req/Kconfig b/tests/bluetooth/controller/ctrl_cte_req/Kconfig index f78dc9f2027269..b99aec62708b07 100644 --- a/tests/bluetooth/controller/ctrl_cte_req/Kconfig +++ b/tests/bluetooth/controller/ctrl_cte_req/Kconfig @@ -43,5 +43,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_data_length_update/Kconfig b/tests/bluetooth/controller/ctrl_data_length_update/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_data_length_update/Kconfig +++ b/tests/bluetooth/controller/ctrl_data_length_update/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_encrypt/Kconfig b/tests/bluetooth/controller/ctrl_encrypt/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_encrypt/Kconfig +++ b/tests/bluetooth/controller/ctrl_encrypt/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_feature_exchange/Kconfig b/tests/bluetooth/controller/ctrl_feature_exchange/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_feature_exchange/Kconfig +++ b/tests/bluetooth/controller/ctrl_feature_exchange/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_hci/Kconfig b/tests/bluetooth/controller/ctrl_hci/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_hci/Kconfig +++ b/tests/bluetooth/controller/ctrl_hci/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_invalid/Kconfig b/tests/bluetooth/controller/ctrl_invalid/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_invalid/Kconfig +++ b/tests/bluetooth/controller/ctrl_invalid/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_isoal/Kconfig b/tests/bluetooth/controller/ctrl_isoal/Kconfig index e6623e8e3b21fb..0ebff8c230c6b8 100644 --- a/tests/bluetooth/controller/ctrl_isoal/Kconfig +++ b/tests/bluetooth/controller/ctrl_isoal/Kconfig @@ -57,4 +57,6 @@ config BT_CTLR_ISOAL_SN_STRICT depends on BT_CTLR_ADV_ISO || BT_CTLR_CONN_ISO default y +source "tests/bluetooth/controller/common/Kconfig" + source "Kconfig.zephyr" diff --git a/tests/bluetooth/controller/ctrl_le_ping/Kconfig b/tests/bluetooth/controller/ctrl_le_ping/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_le_ping/Kconfig +++ b/tests/bluetooth/controller/ctrl_le_ping/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_min_used_chans/Kconfig b/tests/bluetooth/controller/ctrl_min_used_chans/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_min_used_chans/Kconfig +++ b/tests/bluetooth/controller/ctrl_min_used_chans/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_phy_update/Kconfig b/tests/bluetooth/controller/ctrl_phy_update/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_phy_update/Kconfig +++ b/tests/bluetooth/controller/ctrl_phy_update/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_sca_update/Kconfig b/tests/bluetooth/controller/ctrl_sca_update/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_sca_update/Kconfig +++ b/tests/bluetooth/controller/ctrl_sca_update/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_sw_privacy/Kconfig b/tests/bluetooth/controller/ctrl_sw_privacy/Kconfig new file mode 100644 index 00000000000000..11b09cd9ee1085 --- /dev/null +++ b/tests/bluetooth/controller/ctrl_sw_privacy/Kconfig @@ -0,0 +1,7 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +source "tests/bluetooth/controller/common/Kconfig" + +# Include Zephyr's Kconfig +source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_sw_privacy_unit/Kconfig b/tests/bluetooth/controller/ctrl_sw_privacy_unit/Kconfig new file mode 100644 index 00000000000000..11b09cd9ee1085 --- /dev/null +++ b/tests/bluetooth/controller/ctrl_sw_privacy_unit/Kconfig @@ -0,0 +1,7 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +source "tests/bluetooth/controller/common/Kconfig" + +# Include Zephyr's Kconfig +source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_terminate/Kconfig b/tests/bluetooth/controller/ctrl_terminate/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_terminate/Kconfig +++ b/tests/bluetooth/controller/ctrl_terminate/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/Kconfig b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/Kconfig +++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_tx_queue/Kconfig b/tests/bluetooth/controller/ctrl_tx_queue/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_tx_queue/Kconfig +++ b/tests/bluetooth/controller/ctrl_tx_queue/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_unsupported/Kconfig b/tests/bluetooth/controller/ctrl_unsupported/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_unsupported/Kconfig +++ b/tests/bluetooth/controller/ctrl_unsupported/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_user_ext/Kconfig b/tests/bluetooth/controller/ctrl_user_ext/Kconfig new file mode 100644 index 00000000000000..11b09cd9ee1085 --- /dev/null +++ b/tests/bluetooth/controller/ctrl_user_ext/Kconfig @@ -0,0 +1,7 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +source "tests/bluetooth/controller/common/Kconfig" + +# Include Zephyr's Kconfig +source "Kconfig" diff --git a/tests/bluetooth/controller/ctrl_version/Kconfig b/tests/bluetooth/controller/ctrl_version/Kconfig index b4d4d841f3d56c..656446cacf39f1 100644 --- a/tests/bluetooth/controller/ctrl_version/Kconfig +++ b/tests/bluetooth/controller/ctrl_version/Kconfig @@ -25,5 +25,7 @@ config ENTROPY_NRF_FORCE_ALT config ENTROPY_NRF5_RNG default n +source "tests/bluetooth/controller/common/Kconfig" + # Include Zephyr's Kconfig source "Kconfig" diff --git a/tests/bluetooth/controller/ll_settings/Kconfig b/tests/bluetooth/controller/ll_settings/Kconfig new file mode 100644 index 00000000000000..11b09cd9ee1085 --- /dev/null +++ b/tests/bluetooth/controller/ll_settings/Kconfig @@ -0,0 +1,7 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +source "tests/bluetooth/controller/common/Kconfig" + +# Include Zephyr's Kconfig +source "Kconfig"