diff --git a/samples/bluetooth/bap_broadcast_sink/prj.conf b/samples/bluetooth/bap_broadcast_sink/prj.conf index 728c2a9f2cdcc4..c8a1dd228fa4e4 100644 --- a/samples/bluetooth/bap_broadcast_sink/prj.conf +++ b/samples/bluetooth/bap_broadcast_sink/prj.conf @@ -4,6 +4,8 @@ CONFIG_BT_AUDIO=y CONFIG_BT_SMP=y CONFIG_BT_PAC_SNK=y CONFIG_BT_PERIPHERAL=y +CONFIG_BT_OBSERVER=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_BAP_BROADCAST_SINK=y CONFIG_BT_BAP_SCAN_DELEGATOR=y CONFIG_BT_ISO_MAX_CHAN=2 diff --git a/samples/bluetooth/bap_unicast_server/prj.conf b/samples/bluetooth/bap_unicast_server/prj.conf index 38e3bb48b37a60..aa4b4a45b9ab31 100644 --- a/samples/bluetooth/bap_unicast_server/prj.conf +++ b/samples/bluetooth/bap_unicast_server/prj.conf @@ -4,6 +4,7 @@ CONFIG_BT_SMP=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_AUDIO=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_BAP_UNICAST_SERVER=y CONFIG_BT_ASCS=y CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2 diff --git a/samples/bluetooth/cap_acceptor/prj.conf b/samples/bluetooth/cap_acceptor/prj.conf index fb4a13850cec59..b3e91bd50675b6 100644 --- a/samples/bluetooth/cap_acceptor/prj.conf +++ b/samples/bluetooth/cap_acceptor/prj.conf @@ -7,6 +7,7 @@ CONFIG_BT_DEVICE_NAME="CAP Acceptor" CONFIG_BT_AUDIO=y CONFIG_BT_SMP=y CONFIG_BT_KEYS_OVERWRITE_OLDEST=y +CONFIG_BT_GATT_DYNAMIC_DB=y # CAP CONFIG_BT_CAP_ACCEPTOR=y diff --git a/samples/bluetooth/cap_initiator/prj.conf b/samples/bluetooth/cap_initiator/prj.conf index 019b54c2757603..c1182a5f2be166 100644 --- a/samples/bluetooth/cap_initiator/prj.conf +++ b/samples/bluetooth/cap_initiator/prj.conf @@ -18,6 +18,8 @@ CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT=2 CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT=2 CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SRC_COUNT=2 +CONFIG_BT_BAP_BROADCAST_SOURCE=y + # Broadcast sources values if enabled by CONFIG_SAMPLE_BROADCAST CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=2 CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT=1 diff --git a/samples/bluetooth/hap_ha/prj.conf b/samples/bluetooth/hap_ha/prj.conf index 222da719c760fd..1c86d14e8f555d 100644 --- a/samples/bluetooth/hap_ha/prj.conf +++ b/samples/bluetooth/hap_ha/prj.conf @@ -2,6 +2,7 @@ CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_PRIVACY=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_SMP=y CONFIG_BT_SMP_SC_PAIR_ONLY=y diff --git a/samples/bluetooth/pbp_public_broadcast_sink/prj.conf b/samples/bluetooth/pbp_public_broadcast_sink/prj.conf index 0feae717a7777a..002c41ed92d36b 100644 --- a/samples/bluetooth/pbp_public_broadcast_sink/prj.conf +++ b/samples/bluetooth/pbp_public_broadcast_sink/prj.conf @@ -2,6 +2,8 @@ CONFIG_BT=y CONFIG_LOG=y CONFIG_BT_PAC_SNK=y CONFIG_BT_PERIPHERAL=y +CONFIG_BT_OBSERVER=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_AUDIO=y CONFIG_UTF8=y diff --git a/samples/bluetooth/tmap_bmr/prj.conf b/samples/bluetooth/tmap_bmr/prj.conf index 7c3ea5b037299e..2a87e242cb4225 100644 --- a/samples/bluetooth/tmap_bmr/prj.conf +++ b/samples/bluetooth/tmap_bmr/prj.conf @@ -3,6 +3,7 @@ CONFIG_LOG=y CONFIG_BT_PAC_SNK=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y +CONFIG_BT_OBSERVER=y CONFIG_BT_AUDIO=y CONFIG_UTF8=y diff --git a/subsys/bluetooth/Kconfig.iso b/subsys/bluetooth/Kconfig.iso index 9fbb0a1b78fee0..714ed0c1d97b53 100644 --- a/subsys/bluetooth/Kconfig.iso +++ b/subsys/bluetooth/Kconfig.iso @@ -27,7 +27,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 - select BT_PERIPHERAL + depends on BT_PERIPHERAL select BT_ISO_UNICAST help This option enables support for Bluetooth Unicast @@ -36,7 +36,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 - select BT_CENTRAL + depends on BT_CENTRAL select BT_ISO_UNICAST help This option enables support for Bluetooth Broadcast @@ -60,9 +60,9 @@ 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 BT_OBSERVER select BT_ISO_BROADCAST select BT_ISO_RX - select BT_OBSERVER select BT_PER_ADV_SYNC help This option enables support for the Bluetooth Isochronous diff --git a/subsys/bluetooth/audio/Kconfig.aics b/subsys/bluetooth/audio/Kconfig.aics index b39c4027e81c00..bcc6c2fafdbaf6 100644 --- a/subsys/bluetooth/audio/Kconfig.aics +++ b/subsys/bluetooth/audio/Kconfig.aics @@ -19,7 +19,7 @@ config BT_AICS_MAX_INSTANCE_COUNT config BT_AICS bool # hidden default y if BT_AICS_MAX_INSTANCE_COUNT > 0 - select BT_GATT_DYNAMIC_DB + depends on BT_GATT_DYNAMIC_DB help This hidden option enables support for Audio Input Control Service. diff --git a/subsys/bluetooth/audio/Kconfig.bap b/subsys/bluetooth/audio/Kconfig.bap index 37b2f12bd78b34..e589e8608cb938 100644 --- a/subsys/bluetooth/audio/Kconfig.bap +++ b/subsys/bluetooth/audio/Kconfig.bap @@ -12,8 +12,8 @@ config BT_BAP_UNICAST config BT_BAP_UNICAST_SERVER bool "Bluetooth Unicast Audio Server Support" select BT_BAP_UNICAST - select BT_GATT_DYNAMIC_DB - select BT_GATT_CACHING + depends on BT_GATT_DYNAMIC_DB + depends on BT_GATT_CACHING depends on BT_PERIPHERAL depends on BT_ISO_PERIPHERAL depends on BT_ASCS @@ -207,11 +207,11 @@ endif # BT_BAP_BROADCAST_SINK config BT_BAP_SCAN_DELEGATOR bool "Basic Audio Profile Scan Delegator role support" - select BT_OBSERVER select BT_EXT_ADV select BT_PER_ADV_SYNC select BT_ISO_SYNC_RECEIVER - select BT_GATT_DYNAMIC_DB + depends on BT_OBSERVER + depends on BT_GATT_DYNAMIC_DB depends on BT_BONDABLE help This option enables support for the Scan Delegator role and the @@ -241,13 +241,13 @@ endif # BT_BAP_SCAN_DELEGATOR config BT_BAP_BROADCAST_ASSISTANT bool "Basic Audio Profile Broadcast Assistant role support" - select BT_OBSERVER 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_OBSERVER depends on BT_BONDABLE help This option enables support for the Broadcast Assistant role. diff --git a/subsys/bluetooth/audio/Kconfig.cap b/subsys/bluetooth/audio/Kconfig.cap index 5ba8a9bf2f035a..d87f109f2b2224 100644 --- a/subsys/bluetooth/audio/Kconfig.cap +++ b/subsys/bluetooth/audio/Kconfig.cap @@ -20,7 +20,7 @@ config BT_CAP_ACCEPTOR_SET_MEMBER bool "Common Audio Profile Acceptor Role Set Member support" depends on BT_CAP_ACCEPTOR depends on BT_CSIP_SET_MEMBER - select BT_GATT_DYNAMIC_DB + depends on BT_GATT_DYNAMIC_DB help Enabling this will allow a CAP acceptor to be a set member. Enabling this will require a manual register of the CAS service. diff --git a/subsys/bluetooth/audio/Kconfig.has b/subsys/bluetooth/audio/Kconfig.has index 16e80d3558431b..576f98fdcf6b5c 100644 --- a/subsys/bluetooth/audio/Kconfig.has +++ b/subsys/bluetooth/audio/Kconfig.has @@ -7,7 +7,7 @@ menuconfig BT_HAS bool "Hearing Access Service support" select UTF8 - select BT_GATT_DYNAMIC_DB + depends on BT_GATT_DYNAMIC_DB depends on BT_BAP_UNICAST_SERVER help This option enables support for Hearing Access Service. diff --git a/subsys/bluetooth/audio/Kconfig.mcs b/subsys/bluetooth/audio/Kconfig.mcs index b7ebca32e618a6..651e11a9be5b58 100644 --- a/subsys/bluetooth/audio/Kconfig.mcs +++ b/subsys/bluetooth/audio/Kconfig.mcs @@ -10,10 +10,10 @@ config BT_MCS bool "Media Control Service Support" + select BT_CCID depends on MCTL_LOCAL_PLAYER_REMOTE_CONTROL depends on UTF8 - select BT_CCID - select BT_GATT_DYNAMIC_DB + depends on BT_GATT_DYNAMIC_DB help This option enables support for the Media Control Service. diff --git a/subsys/bluetooth/audio/Kconfig.micp b/subsys/bluetooth/audio/Kconfig.micp index 2d982d199e107b..16399381b7cfc0 100644 --- a/subsys/bluetooth/audio/Kconfig.micp +++ b/subsys/bluetooth/audio/Kconfig.micp @@ -10,7 +10,7 @@ config BT_MICP_MIC_DEV bool "Microphone Control Profile Microphone Device Support" - select BT_GATT_DYNAMIC_DB + depends on BT_GATT_DYNAMIC_DB depends on BT_BONDABLE help This option enables support for Microphone Control Profile diff --git a/subsys/bluetooth/audio/Kconfig.tbs b/subsys/bluetooth/audio/Kconfig.tbs index 54275efa970230..d0c6ffc2c2204f 100644 --- a/subsys/bluetooth/audio/Kconfig.tbs +++ b/subsys/bluetooth/audio/Kconfig.tbs @@ -13,7 +13,7 @@ if BT_AUDIO config BT_TBS bool "Telephone Bearer Service Support" select BT_CCID - select BT_GATT_DYNAMIC_DB + depends on BT_GATT_DYNAMIC_DB depends on UTF8 help This option enables support for Telephone Bearer Service. By default this only diff --git a/subsys/bluetooth/audio/Kconfig.vcp b/subsys/bluetooth/audio/Kconfig.vcp index 084f1397d0c376..d75d1943f6da07 100644 --- a/subsys/bluetooth/audio/Kconfig.vcp +++ b/subsys/bluetooth/audio/Kconfig.vcp @@ -10,7 +10,7 @@ config BT_VCP_VOL_REND bool "Volume Control Profile Volume Renderer Support" - select BT_GATT_DYNAMIC_DB + depends on BT_GATT_DYNAMIC_DB help This option enables support for Volume Control Profile Volume Renderer role and the Volume Control Service.