diff --git a/samples/bluetooth/bap_broadcast_assistant/prj.conf b/samples/bluetooth/bap_broadcast_assistant/prj.conf index 8880c02eaf1..3bef6a1e8e6 100644 --- a/samples/bluetooth/bap_broadcast_assistant/prj.conf +++ b/samples/bluetooth/bap_broadcast_assistant/prj.conf @@ -1,6 +1,9 @@ CONFIG_BT=y CONFIG_LOG=y CONFIG_BT_CENTRAL=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y +CONFIG_BT_GATT_AUTO_UPDATE_MTU=y CONFIG_BT_AUDIO=y CONFIG_BT_SMP=y CONFIG_BT_BUF_ACL_RX_SIZE=255 diff --git a/samples/bluetooth/bap_unicast_client/prj.conf b/samples/bluetooth/bap_unicast_client/prj.conf index 518a7fa5e6a..6d6658d728b 100644 --- a/samples/bluetooth/bap_unicast_client/prj.conf +++ b/samples/bluetooth/bap_unicast_client/prj.conf @@ -3,6 +3,9 @@ CONFIG_LOG=y CONFIG_BT_SMP=y CONFIG_BT_CENTRAL=y CONFIG_BT_ISO_CENTRAL=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y +CONFIG_BT_GATT_AUTO_UPDATE_MTU=y CONFIG_BT_AUDIO=y CONFIG_BT_BAP_UNICAST_CLIENT=y CONFIG_BT_ISO_TX_BUF_COUNT=4 diff --git a/samples/bluetooth/cap_initiator/Kconfig b/samples/bluetooth/cap_initiator/Kconfig index fecba8e247f..794eab831d5 100644 --- a/samples/bluetooth/cap_initiator/Kconfig +++ b/samples/bluetooth/cap_initiator/Kconfig @@ -7,6 +7,9 @@ config SAMPLE_UNICAST bool "Whether or not to search for CAP acceptors for unicast audio" default y select BT_CENTRAL + select BT_GATT_CLIENT + select BT_GATT_AUTO_DISCOVER_CCC + select BT_GATT_AUTO_UPDATE_MTU select BT_ISO_CENTRAL select BT_SMP select BT_KEYS_OVERWRITE_OLDEST diff --git a/samples/bluetooth/hap_ha/prj.conf b/samples/bluetooth/hap_ha/prj.conf index ad0c2d8c3a8..93d624a5095 100644 --- a/samples/bluetooth/hap_ha/prj.conf +++ b/samples/bluetooth/hap_ha/prj.conf @@ -4,6 +4,8 @@ CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_PRIVACY=y CONFIG_BT_GATT_CACHING=y CONFIG_BT_GATT_DYNAMIC_DB=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y CONFIG_BT_SMP=y CONFIG_BT_SMP_SC_PAIR_ONLY=y diff --git a/samples/bluetooth/tmap_central/prj.conf b/samples/bluetooth/tmap_central/prj.conf index 3c96524784d..0718245e201 100644 --- a/samples/bluetooth/tmap_central/prj.conf +++ b/samples/bluetooth/tmap_central/prj.conf @@ -2,6 +2,9 @@ CONFIG_BT=y CONFIG_LOG=y CONFIG_BT_CENTRAL=y CONFIG_BT_ISO_CENTRAL=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y +CONFIG_BT_GATT_AUTO_UPDATE_MTU=y CONFIG_BT_AUDIO=y CONFIG_BT_SMP=y diff --git a/samples/bluetooth/tmap_peripheral/prj.conf b/samples/bluetooth/tmap_peripheral/prj.conf index 8c1d6210b28..f37bb44f2c0 100644 --- a/samples/bluetooth/tmap_peripheral/prj.conf +++ b/samples/bluetooth/tmap_peripheral/prj.conf @@ -2,6 +2,8 @@ CONFIG_BT=y CONFIG_LOG=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_ISO_PERIPHERAL=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y CONFIG_BT_PRIVACY=y CONFIG_BT_AUDIO=y CONFIG_UTF8=y diff --git a/subsys/bluetooth/audio/Kconfig.bap b/subsys/bluetooth/audio/Kconfig.bap index 7e375a2e2c4..bb05d9c5ee7 100644 --- a/subsys/bluetooth/audio/Kconfig.bap +++ b/subsys/bluetooth/audio/Kconfig.bap @@ -24,9 +24,9 @@ config BT_BAP_UNICAST_SERVER config BT_BAP_UNICAST_CLIENT bool "Bluetooth Unicast Audio Client Support" - select BT_GATT_CLIENT - select BT_GATT_AUTO_DISCOVER_CCC - select BT_GATT_AUTO_UPDATE_MTU + depends on BT_GATT_CLIENT + depends on BT_GATT_AUTO_DISCOVER_CCC + depends on BT_GATT_AUTO_UPDATE_MTU depends on BT_CENTRAL depends on BT_ISO_CENTRAL depends on BT_BONDABLE @@ -241,9 +241,9 @@ config BT_BAP_BROADCAST_ASSISTANT select BT_EXT_ADV select BT_PER_ADV_SYNC select BT_ISO_SYNC_RECEIVER - select BT_GATT_CLIENT - select BT_GATT_AUTO_DISCOVER_CCC - select BT_GATT_AUTO_UPDATE_MTU + depends on BT_GATT_CLIENT + depends on BT_GATT_AUTO_DISCOVER_CCC + depends on BT_GATT_AUTO_UPDATE_MTU depends on BT_OBSERVER depends on BT_BONDABLE help diff --git a/subsys/bluetooth/audio/Kconfig.csip b/subsys/bluetooth/audio/Kconfig.csip index 0b248fe82fe..7ca25770c0f 100644 --- a/subsys/bluetooth/audio/Kconfig.csip +++ b/subsys/bluetooth/audio/Kconfig.csip @@ -57,8 +57,8 @@ endif # BT_CSIP_SET_MEMBER config BT_CSIP_SET_COORDINATOR bool "Coordinated Set Identification Profile Set Coordinator Support" - select BT_GATT_CLIENT - select BT_GATT_AUTO_DISCOVER_CCC + depends on BT_GATT_CLIENT + depends on BT_GATT_AUTO_DISCOVER_CCC help This option enables support for Coordinated Set Identification Profile Set Coordinator. diff --git a/subsys/bluetooth/audio/Kconfig.has b/subsys/bluetooth/audio/Kconfig.has index 576f98fdcf6..f7d4de583fd 100644 --- a/subsys/bluetooth/audio/Kconfig.has +++ b/subsys/bluetooth/audio/Kconfig.has @@ -56,9 +56,9 @@ endif # BT_HAS config BT_HAS_CLIENT bool "Hearing Access Service Client support" - select BT_GATT_CLIENT - select BT_GATT_AUTO_DISCOVER_CCC - select BT_GATT_AUTO_UPDATE_MTU + depends on BT_GATT_CLIENT + depends on BT_GATT_AUTO_DISCOVER_CCC select UTF8 + depends on BT_GATT_AUTO_UPDATE_MTU help This option enables support for Hearing Access Service Client. diff --git a/subsys/bluetooth/audio/Kconfig.mcs b/subsys/bluetooth/audio/Kconfig.mcs index 4814140bf08..6c08dd57d20 100644 --- a/subsys/bluetooth/audio/Kconfig.mcs +++ b/subsys/bluetooth/audio/Kconfig.mcs @@ -20,8 +20,8 @@ config BT_MCS config BT_MCC bool "Media Control Client Support" - select BT_GATT_CLIENT - select BT_GATT_AUTO_DISCOVER_CCC + depends on BT_GATT_CLIENT + depends on BT_GATT_AUTO_DISCOVER_CCC help This option enables support for the Media Control Client. diff --git a/subsys/bluetooth/audio/Kconfig.micp b/subsys/bluetooth/audio/Kconfig.micp index 16399381b7c..2581f1694f3 100644 --- a/subsys/bluetooth/audio/Kconfig.micp +++ b/subsys/bluetooth/audio/Kconfig.micp @@ -40,8 +40,8 @@ endif # BT_MICP_MIC_DEV config BT_MICP_MIC_CTLR bool "Microphone Control Profile Microphone Controller Support" - select BT_GATT_CLIENT - select BT_GATT_AUTO_DISCOVER_CCC + depends on BT_GATT_CLIENT + depends on BT_GATT_AUTO_DISCOVER_CCC depends on BT_BONDABLE help This option enables support for the Microphone Control Profile diff --git a/subsys/bluetooth/audio/Kconfig.tbs b/subsys/bluetooth/audio/Kconfig.tbs index 7c42b74c363..14729499bee 100644 --- a/subsys/bluetooth/audio/Kconfig.tbs +++ b/subsys/bluetooth/audio/Kconfig.tbs @@ -70,8 +70,8 @@ config BT_TBS_CLIENT_TBS config BT_TBS_CLIENT def_bool BT_TBS_CLIENT_GTBS || BT_TBS_CLIENT_TBS - select BT_GATT_CLIENT - select BT_GATT_AUTO_DISCOVER_CCC + depends on BT_GATT_CLIENT + depends on BT_GATT_AUTO_DISCOVER_CCC if BT_TBS_CLIENT diff --git a/subsys/bluetooth/audio/Kconfig.vcp b/subsys/bluetooth/audio/Kconfig.vcp index d75d1943f6d..3699e56c822 100644 --- a/subsys/bluetooth/audio/Kconfig.vcp +++ b/subsys/bluetooth/audio/Kconfig.vcp @@ -58,8 +58,8 @@ endif # BT_VCP_VOL_REND config BT_VCP_VOL_CTLR bool "Volume Control Profile Volume Controller Support" - select BT_GATT_CLIENT - select BT_GATT_AUTO_DISCOVER_CCC + depends on BT_GATT_CLIENT + depends on BT_GATT_AUTO_DISCOVER_CCC help This option enables support for Volume Control Profile Volume Controller. diff --git a/tests/bluetooth/audio/ascs/testcase.yaml b/tests/bluetooth/audio/ascs/testcase.yaml index ba6e549c306..63663c81773 100644 --- a/tests/bluetooth/audio/ascs/testcase.yaml +++ b/tests/bluetooth/audio/ascs/testcase.yaml @@ -17,6 +17,9 @@ tests: type: unit extra_configs: - CONFIG_BT_BAP_UNICAST_CLIENT=y + - CONFIG_BT_GATT_CLIENT=y + - CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y + - CONFIG_BT_GATT_AUTO_UPDATE_MTU=y bluetooth.audio.ascs.test_stream_pair: type: unit extra_configs: diff --git a/tests/bluetooth/audio/cap_commander/prj.conf b/tests/bluetooth/audio/cap_commander/prj.conf index 840926e2392..0ca1961eef7 100644 --- a/tests/bluetooth/audio/cap_commander/prj.conf +++ b/tests/bluetooth/audio/cap_commander/prj.conf @@ -5,7 +5,10 @@ CONFIG_BT_SMP=y CONFIG_BT_CENTRAL=y CONFIG_BT_MAX_CONN=2 CONFIG_BT_OBSERVER=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y CONFIG_BT_GATT_DYNAMIC_DB=y +CONFIG_BT_GATT_AUTO_UPDATE_MTU=y CONFIG_BT_AUDIO=y # Requirements for CAP commander diff --git a/tests/bluetooth/audio/cap_initiator/prj.conf b/tests/bluetooth/audio/cap_initiator/prj.conf index 52b330d86ae..85b8fe6aad4 100644 --- a/tests/bluetooth/audio/cap_initiator/prj.conf +++ b/tests/bluetooth/audio/cap_initiator/prj.conf @@ -5,6 +5,9 @@ CONFIG_BT=y CONFIG_BT_SMP=y CONFIG_BT_CENTRAL=y CONFIG_BT_ISO_CENTRAL=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y +CONFIG_BT_GATT_AUTO_UPDATE_MTU=y CONFIG_BT_AUDIO=y # Dependencies for CAP initiator unicast diff --git a/tests/bluetooth/shell/audio.conf b/tests/bluetooth/shell/audio.conf index 049c6b766fe..a509fd8f83c 100644 --- a/tests/bluetooth/shell/audio.conf +++ b/tests/bluetooth/shell/audio.conf @@ -13,8 +13,11 @@ CONFIG_BT_CENTRAL=y CONFIG_BT_ISO_CENTRAL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y +CONFIG_BT_GATT_CLIENT=y CONFIG_BT_GATT_CACHING=y CONFIG_BT_GATT_DYNAMIC_DB=y +CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y +CONFIG_BT_GATT_AUTO_UPDATE_MTU=y CONFIG_BT_L2CAP_ECRED=y CONFIG_BT_SIGNING=y CONFIG_BT_FIXED_PASSKEY=y diff --git a/tests/bluetooth/tester/overlay-le-audio.conf b/tests/bluetooth/tester/overlay-le-audio.conf index acbde1ea0d7..3f1b5878bf3 100644 --- a/tests/bluetooth/tester/overlay-le-audio.conf +++ b/tests/bluetooth/tester/overlay-le-audio.conf @@ -1,8 +1,11 @@ CONFIG_BT_AUDIO=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y +CONFIG_BT_GATT_CLIENT=y CONFIG_BT_GATT_CACHING=y CONFIG_BT_GATT_DYNAMIC_DB=y +CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y +CONFIG_BT_GATT_AUTO_UPDATE_MTU=y CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_ISO_CENTRAL=y CONFIG_BT_EXT_ADV=y diff --git a/tests/bsim/bluetooth/audio/prj.conf b/tests/bsim/bluetooth/audio/prj.conf index 9ca0a167b61..70b0e8d465b 100644 --- a/tests/bsim/bluetooth/audio/prj.conf +++ b/tests/bsim/bluetooth/audio/prj.conf @@ -14,8 +14,11 @@ CONFIG_BT_MAX_CONN=3 CONFIG_BT_MAX_PAIRED=3 CONFIG_BT_EXT_ADV_MAX_ADV_SET=3 CONFIG_BT_OBSERVER=y +CONFIG_BT_GATT_CLIENT=y CONFIG_BT_GATT_CACHING=y CONFIG_BT_GATT_DYNAMIC_DB=y +CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y +CONFIG_BT_GATT_AUTO_UPDATE_MTU=y CONFIG_BT_SMP=y CONFIG_BT_L2CAP_TX_MTU=128 CONFIG_BT_BUF_ACL_RX_SIZE=255