From 8dad10a4de8f223cd4b3c448dc54d01d60d7cb01 Mon Sep 17 00:00:00 2001 From: Babak Arisian Date: Thu, 3 Oct 2024 09:49:46 +0200 Subject: [PATCH] Bluetooth: Audio: Update SCAN_DELEGATOR dependency to GATT_DYNAMIC_DB Changed dependency of the BT_BAP_SCAN_DELEGATOR to GATT_DYNAMIC_DB from 'select' to 'depends on' and solved all loop dependencies caused by this change. Fixes #79108 Signed-off-by: Babak Arisian --- samples/bluetooth/bap_broadcast_assistant/prj.conf | 1 + samples/bluetooth/bap_broadcast_sink/prj.conf | 2 ++ samples/bluetooth/bap_unicast_server/prj.conf | 2 ++ samples/bluetooth/cap_acceptor/prj.conf | 3 +++ samples/bluetooth/cap_initiator/prj.conf | 2 ++ samples/bluetooth/hap_ha/binaural.conf | 1 + samples/bluetooth/hap_ha/prj.conf | 2 ++ .../hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf | 1 + .../hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf | 2 ++ .../hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf | 3 +++ .../bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf | 3 +++ .../hci_uart_3wire/overlay-all-bt_ll_sw_split.conf | 3 +++ samples/bluetooth/iso_central/prj.conf | 1 + samples/bluetooth/iso_connected_benchmark/prj.conf | 2 ++ samples/bluetooth/iso_peripheral/prj.conf | 1 + samples/bluetooth/iso_receive/prj.conf | 1 + samples/bluetooth/pbp_public_broadcast_sink/prj.conf | 2 ++ samples/bluetooth/tmap_bmr/prj.conf | 1 + samples/bluetooth/tmap_peripheral/duo.conf | 1 + samples/bluetooth/tmap_peripheral/prj.conf | 1 + subsys/bluetooth/Kconfig.iso | 6 +++--- subsys/bluetooth/audio/Kconfig.aics | 2 +- subsys/bluetooth/audio/Kconfig.bap | 10 +++++----- subsys/bluetooth/audio/Kconfig.cap | 2 +- subsys/bluetooth/audio/Kconfig.has | 2 +- subsys/bluetooth/audio/Kconfig.mcs | 4 ++-- subsys/bluetooth/audio/Kconfig.micp | 2 +- subsys/bluetooth/audio/Kconfig.tbs | 2 +- subsys/bluetooth/audio/Kconfig.vcp | 2 +- tests/bluetooth/audio/ascs/prj.conf | 2 ++ tests/bluetooth/audio/bap_base/prj.conf | 2 ++ tests/bluetooth/audio/cap_commander/prj.conf | 2 ++ tests/bluetooth/audio/codec/prj.conf | 2 ++ tests/bluetooth/init/prj_ctlr_5_x_dbg.conf | 1 + tests/bluetooth/shell/audio.conf | 3 +++ tests/bluetooth/shell/log.conf | 1 + tests/bluetooth/shell/prj.conf | 1 + tests/bluetooth/tester/overlay-le-audio.conf | 4 ++++ tests/bsim/bluetooth/audio/prj.conf | 2 ++ tests/bsim/bluetooth/host/iso/bis/prj.conf | 1 + tests/bsim/bluetooth/host/iso/cis/prj.conf | 2 ++ tests/bsim/bluetooth/ll/bis/prj.conf | 1 + tests/bsim/bluetooth/ll/bis/prj_vs_dp.conf | 1 + tests/bsim/bluetooth/ll/cis/prj.conf | 2 ++ .../nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf | 3 +++ 45 files changed, 81 insertions(+), 16 deletions(-) diff --git a/samples/bluetooth/bap_broadcast_assistant/prj.conf b/samples/bluetooth/bap_broadcast_assistant/prj.conf index 8880c02eaf1a9d4..64605d7bf58b86d 100644 --- a/samples/bluetooth/bap_broadcast_assistant/prj.conf +++ b/samples/bluetooth/bap_broadcast_assistant/prj.conf @@ -1,6 +1,7 @@ CONFIG_BT=y CONFIG_LOG=y CONFIG_BT_CENTRAL=y +CONFIG_BT_OBSERVER=y CONFIG_BT_AUDIO=y CONFIG_BT_SMP=y CONFIG_BT_BUF_ACL_RX_SIZE=255 diff --git a/samples/bluetooth/bap_broadcast_sink/prj.conf b/samples/bluetooth/bap_broadcast_sink/prj.conf index 728c2a9f2cdcc4b..c8a1dd228fa4e46 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 38e3bb48b37a606..bc8bb687dab3fbe 100644 --- a/samples/bluetooth/bap_unicast_server/prj.conf +++ b/samples/bluetooth/bap_unicast_server/prj.conf @@ -4,6 +4,8 @@ CONFIG_BT_SMP=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_AUDIO=y +CONFIG_BT_GATT_CACHING=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 fb4a13850cec598..c4c405ed868eaf4 100644 --- a/samples/bluetooth/cap_acceptor/prj.conf +++ b/samples/bluetooth/cap_acceptor/prj.conf @@ -1,6 +1,9 @@ CONFIG_BT=y CONFIG_LOG=y CONFIG_BT_PERIPHERAL=y +CONFIG_BT_OBSERVER=y +CONFIG_BT_GATT_CACHING=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_GATT_CLIENT=y CONFIG_BT_EXT_ADV=y CONFIG_BT_DEVICE_NAME="CAP Acceptor" diff --git a/samples/bluetooth/cap_initiator/prj.conf b/samples/bluetooth/cap_initiator/prj.conf index 019b54c27576031..c1182a5f2be1669 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/binaural.conf b/samples/bluetooth/hap_ha/binaural.conf index 040966fb865105a..6230c5afb8d5e01 100644 --- a/samples/bluetooth/hap_ha/binaural.conf +++ b/samples/bluetooth/hap_ha/binaural.conf @@ -1,3 +1,4 @@ CONFIG_BT_CSIP_SET_MEMBER=y CONFIG_HAP_HA_HEARING_AID_BINAURAL=y CONFIG_BT_CAP_ACCEPTOR_SET_MEMBER=y +CONFIG_BT_GATT_DYNAMIC_DB=y diff --git a/samples/bluetooth/hap_ha/prj.conf b/samples/bluetooth/hap_ha/prj.conf index 222da719c760fd6..ad0c2d8c3a810ad 100644 --- a/samples/bluetooth/hap_ha/prj.conf +++ b/samples/bluetooth/hap_ha/prj.conf @@ -2,6 +2,8 @@ CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_PRIVACY=y +CONFIG_BT_GATT_CACHING=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_SMP=y CONFIG_BT_SMP_SC_PAIR_ONLY=y diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf index 27f7b9b80ea20c7..0e4a20602b52057 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf @@ -9,6 +9,7 @@ CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512 CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_BT=y +CONFIG_BT_OBSERVER=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=2 diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf index 040e1db6b4f173e..af142bf7dc6aa6b 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf @@ -25,6 +25,8 @@ CONFIG_BT_BUF_CMD_TX_SIZE=255 # Host features CONFIG_BT_EXT_ADV=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y CONFIG_BT_PER_ADV=n CONFIG_BT_PER_ADV_SYNC=n diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf index c8cad930a3380df..828d91b1486425b 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf @@ -13,6 +13,9 @@ CONFIG_ISR_TABLES_LOCAL_DECLARATION=y CONFIG_LTO=y CONFIG_BT=y +CONFIG_BT_OBSERVER=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=3 diff --git a/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf b/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf index 8d6dbdd87b016db..96a35c3fa8b4210 100644 --- a/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf @@ -10,6 +10,9 @@ CONFIG_BT_EXT_ADV=y CONFIG_BT_PER_ADV=y CONFIG_BT_PER_ADV_SYNC=y CONFIG_BT_PER_ADV_SYNC_MAX=2 +CONFIG_BT_OBSERVER=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y # Broadcast and Connected ISO CONFIG_BT_ISO_BROADCASTER=y diff --git a/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf b/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf index 75542eff6705e62..59e7b34ad00b2e2 100644 --- a/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf @@ -10,6 +10,9 @@ CONFIG_BT_EXT_ADV=y CONFIG_BT_PER_ADV=y CONFIG_BT_PER_ADV_SYNC=y CONFIG_BT_PER_ADV_SYNC_MAX=2 +CONFIG_BT_OBSERVER=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y # Broadcast and Connected ISO CONFIG_BT_ISO_BROADCASTER=y diff --git a/samples/bluetooth/iso_central/prj.conf b/samples/bluetooth/iso_central/prj.conf index 81264161a5c4255..2134768f0a78704 100644 --- a/samples/bluetooth/iso_central/prj.conf +++ b/samples/bluetooth/iso_central/prj.conf @@ -1,3 +1,4 @@ CONFIG_BT=y CONFIG_LOG=y +CONFIG_BT_CENTRAL=y CONFIG_BT_ISO_CENTRAL=y diff --git a/samples/bluetooth/iso_connected_benchmark/prj.conf b/samples/bluetooth/iso_connected_benchmark/prj.conf index 76fabb0fa730b82..09781083adbc573 100644 --- a/samples/bluetooth/iso_connected_benchmark/prj.conf +++ b/samples/bluetooth/iso_connected_benchmark/prj.conf @@ -3,6 +3,8 @@ CONFIG_CONSOLE_GETCHAR=y CONFIG_BT_DEVICE_NAME="ISO Connected Throughput" CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y CONFIG_BT_ISO_CENTRAL=y CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_ISO_MAX_CHAN=2 diff --git a/samples/bluetooth/iso_peripheral/prj.conf b/samples/bluetooth/iso_peripheral/prj.conf index a605030ca01c69e..6d91fe7e0d018cc 100644 --- a/samples/bluetooth/iso_peripheral/prj.conf +++ b/samples/bluetooth/iso_peripheral/prj.conf @@ -1,4 +1,5 @@ CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y CONFIG_LOG=y CONFIG_BT_DEVICE_NAME="Zephyr ISO server" CONFIG_BT_ISO_PERIPHERAL=y diff --git a/samples/bluetooth/iso_receive/prj.conf b/samples/bluetooth/iso_receive/prj.conf index 093695a54396233..9cd340b968e786b 100644 --- a/samples/bluetooth/iso_receive/prj.conf +++ b/samples/bluetooth/iso_receive/prj.conf @@ -1,4 +1,5 @@ CONFIG_BT=y +CONFIG_BT_OBSERVER=y CONFIG_BT_ISO_SYNC_RECEIVER=y CONFIG_LOG=y CONFIG_BT_DEVICE_NAME="Test ISO Receive" diff --git a/samples/bluetooth/pbp_public_broadcast_sink/prj.conf b/samples/bluetooth/pbp_public_broadcast_sink/prj.conf index 0feae717a7777a3..002c41ed92d36be 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 7c3ea5b037299e5..2a87e242cb4225a 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/samples/bluetooth/tmap_peripheral/duo.conf b/samples/bluetooth/tmap_peripheral/duo.conf index 82403ced504c527..dcd43288853f1c9 100644 --- a/samples/bluetooth/tmap_peripheral/duo.conf +++ b/samples/bluetooth/tmap_peripheral/duo.conf @@ -1,3 +1,4 @@ CONFIG_BT_CSIP_SET_MEMBER=y CONFIG_TMAP_PERIPHERAL_DUO=y CONFIG_BT_CAP_ACCEPTOR_SET_MEMBER=y +CONFIG_BT_GATT_DYNAMIC_DB=y diff --git a/samples/bluetooth/tmap_peripheral/prj.conf b/samples/bluetooth/tmap_peripheral/prj.conf index 69e721a3c9c77db..8c1d6210b2802bd 100644 --- a/samples/bluetooth/tmap_peripheral/prj.conf +++ b/samples/bluetooth/tmap_peripheral/prj.conf @@ -46,6 +46,7 @@ CONFIG_BT_TBS_CLIENT_TERMINATE_CALL=y CONFIG_BT_TBS_CLIENT_BEARER_URI_SCHEMES_SUPPORTED_LIST=y # Generic config +CONFIG_BT_GATT_CACHING=y CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_GATT_CLIENT=y CONFIG_BT_EXT_ADV=y diff --git a/subsys/bluetooth/Kconfig.iso b/subsys/bluetooth/Kconfig.iso index 9fbb0a1b78fee08..714ed0c1d97b53d 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 b39c4027e81c009..bcc6c2fafdbaf69 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 37b2f12bd78b345..e589e8608cb938e 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 5ba8a9bf2f035af..d87f109f2b22244 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 16e80d3558431b2..576f98fdcf6b5c7 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 b7ebca32e618a60..651e11a9be5b585 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 2d982d199e107b0..16399381b7cfc0c 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 54275efa970230d..d0c6ffc2c2204ff 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 084f1397d0c376f..d75d1943f6da074 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. diff --git a/tests/bluetooth/audio/ascs/prj.conf b/tests/bluetooth/audio/ascs/prj.conf index 18b09f5a329156d..83cedefe0e59430 100644 --- a/tests/bluetooth/audio/ascs/prj.conf +++ b/tests/bluetooth/audio/ascs/prj.conf @@ -6,6 +6,8 @@ CONFIG_BT_MAX_CONN=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_ISO_MAX_CHAN=1 +CONFIG_BT_GATT_CACHING=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_AUDIO=y CONFIG_BT_ASCS=y CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2 diff --git a/tests/bluetooth/audio/bap_base/prj.conf b/tests/bluetooth/audio/bap_base/prj.conf index 8d51961ad57229b..95192bfe8c1df60 100644 --- a/tests/bluetooth/audio/bap_base/prj.conf +++ b/tests/bluetooth/audio/bap_base/prj.conf @@ -4,6 +4,8 @@ CONFIG_BT=y CONFIG_BT_SMP=y CONFIG_BT_AUDIO=y CONFIG_BT_PERIPHERAL=y +CONFIG_BT_OBSERVER=y +CONFIG_BT_GATT_DYNAMIC_DB=y # Need to enable one broadcast role to enable CONFIG_BT_BAP_BASE CONFIG_BT_BAP_SCAN_DELEGATOR=y diff --git a/tests/bluetooth/audio/cap_commander/prj.conf b/tests/bluetooth/audio/cap_commander/prj.conf index 7ff7ee5b23d2a7e..840926e23922a0b 100644 --- a/tests/bluetooth/audio/cap_commander/prj.conf +++ b/tests/bluetooth/audio/cap_commander/prj.conf @@ -4,6 +4,8 @@ CONFIG_BT=y CONFIG_BT_SMP=y CONFIG_BT_CENTRAL=y CONFIG_BT_MAX_CONN=2 +CONFIG_BT_OBSERVER=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_AUDIO=y # Requirements for CAP commander diff --git a/tests/bluetooth/audio/codec/prj.conf b/tests/bluetooth/audio/codec/prj.conf index 0b32d8a3a977d33..ec00ae96a30fdd5 100644 --- a/tests/bluetooth/audio/codec/prj.conf +++ b/tests/bluetooth/audio/codec/prj.conf @@ -5,6 +5,8 @@ CONFIG_BT_SMP=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_AUDIO=y +CONFIG_BT_GATT_CACHING=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_BAP_UNICAST_SERVER=y CONFIG_BT_ASCS=y diff --git a/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf b/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf index 920a9f088609ec8..c108ccfb2ae4efa 100644 --- a/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf +++ b/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf @@ -1,4 +1,5 @@ CONFIG_BT=y +CONFIG_BT_OBSERVER=y CONFIG_BT_CTLR=y CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_CTLR_DUP_FILTER_LEN=16 diff --git a/tests/bluetooth/shell/audio.conf b/tests/bluetooth/shell/audio.conf index 2a2ff06dd4e6d58..b1675e214014df3 100644 --- a/tests/bluetooth/shell/audio.conf +++ b/tests/bluetooth/shell/audio.conf @@ -13,6 +13,9 @@ CONFIG_BT_CENTRAL=y CONFIG_BT_ISO_CENTRAL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y +CONFIG_BT_OBSERVER=y +CONFIG_BT_GATT_CACHING=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_L2CAP_ECRED=y CONFIG_BT_SIGNING=y CONFIG_BT_FIXED_PASSKEY=y diff --git a/tests/bluetooth/shell/log.conf b/tests/bluetooth/shell/log.conf index 7a9aa9b8680fffd..6a86904e873350a 100644 --- a/tests/bluetooth/shell/log.conf +++ b/tests/bluetooth/shell/log.conf @@ -7,6 +7,7 @@ CONFIG_BT=y CONFIG_BT_CENTRAL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y +CONFIG_BT_OBSERVER=y CONFIG_BT_SMP=y CONFIG_BT_SIGNING=y CONFIG_BT_FIXED_PASSKEY=y diff --git a/tests/bluetooth/shell/prj.conf b/tests/bluetooth/shell/prj.conf index 510d0988262c16a..35e86479a808c3f 100644 --- a/tests/bluetooth/shell/prj.conf +++ b/tests/bluetooth/shell/prj.conf @@ -8,6 +8,7 @@ CONFIG_LOG=y CONFIG_BT_CENTRAL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y +CONFIG_BT_OBSERVER=y CONFIG_BT_SMP=y CONFIG_BT_PASSKEY_KEYPRESS=y CONFIG_BT_SIGNING=y diff --git a/tests/bluetooth/tester/overlay-le-audio.conf b/tests/bluetooth/tester/overlay-le-audio.conf index 22e5c5ba6bb8300..2303a4cb2bbfba8 100644 --- a/tests/bluetooth/tester/overlay-le-audio.conf +++ b/tests/bluetooth/tester/overlay-le-audio.conf @@ -1,5 +1,9 @@ CONFIG_BT_AUDIO=y CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_OBSERVER=y +CONFIG_BT_GATT_CACHING=y +CONFIG_BT_GATT_DYNAMIC_DB=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 fd8f7117c4edb43..87e99c270a9ae72 100644 --- a/tests/bsim/bluetooth/audio/prj.conf +++ b/tests/bsim/bluetooth/audio/prj.conf @@ -13,6 +13,8 @@ CONFIG_BT_ATT_PREPARE_COUNT=5 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_CACHING=y CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_SMP=y CONFIG_BT_L2CAP_TX_MTU=128 diff --git a/tests/bsim/bluetooth/host/iso/bis/prj.conf b/tests/bsim/bluetooth/host/iso/bis/prj.conf index e1e57deda07dee5..15eed7dd676170d 100644 --- a/tests/bsim/bluetooth/host/iso/bis/prj.conf +++ b/tests/bsim/bluetooth/host/iso/bis/prj.conf @@ -4,6 +4,7 @@ CONFIG_ASSERT=y CONFIG_BT_EXT_ADV=y CONFIG_BT_PER_ADV=y CONFIG_BT_PER_ADV_SYNC=y +CONFIG_BT_OBSERVER=y CONFIG_BT_DEVICE_NAME="BIS test" diff --git a/tests/bsim/bluetooth/host/iso/cis/prj.conf b/tests/bsim/bluetooth/host/iso/cis/prj.conf index 8637b14f0045ff0..bfdeab2c4e83569 100644 --- a/tests/bsim/bluetooth/host/iso/cis/prj.conf +++ b/tests/bsim/bluetooth/host/iso/cis/prj.conf @@ -1,4 +1,6 @@ CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y CONFIG_LOG=y CONFIG_ASSERT=y CONFIG_BT_SMP=y diff --git a/tests/bsim/bluetooth/ll/bis/prj.conf b/tests/bsim/bluetooth/ll/bis/prj.conf index afa1f5958614c3a..78f65ef818a329d 100644 --- a/tests/bsim/bluetooth/ll/bis/prj.conf +++ b/tests/bsim/bluetooth/ll/bis/prj.conf @@ -1,4 +1,5 @@ CONFIG_BT=y +CONFIG_BT_OBSERVER=y CONFIG_BT_DEVICE_NAME="ISO" CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y diff --git a/tests/bsim/bluetooth/ll/bis/prj_vs_dp.conf b/tests/bsim/bluetooth/ll/bis/prj_vs_dp.conf index 2f0f9ccc86d3385..a0091c4fbfbd45b 100644 --- a/tests/bsim/bluetooth/ll/bis/prj_vs_dp.conf +++ b/tests/bsim/bluetooth/ll/bis/prj_vs_dp.conf @@ -2,6 +2,7 @@ CONFIG_BT=y CONFIG_BT_DEVICE_NAME="ISO" CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y +CONFIG_BT_OBSERVER=y CONFIG_BT_EXT_ADV=y CONFIG_BT_PER_ADV=y CONFIG_BT_PER_ADV_SYNC=y diff --git a/tests/bsim/bluetooth/ll/cis/prj.conf b/tests/bsim/bluetooth/ll/cis/prj.conf index c124cbd223eb9af..ebc9296a650be99 100644 --- a/tests/bsim/bluetooth/ll/cis/prj.conf +++ b/tests/bsim/bluetooth/ll/cis/prj.conf @@ -1,6 +1,8 @@ CONFIG_TEST_CONNECT_ACL_FIRST=n CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y CONFIG_BT_EXT_ADV=y CONFIG_BT_ISO_CENTRAL=y CONFIG_BT_ISO_PERIPHERAL=y diff --git a/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf b/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf index 5119ac0d3eddb67..fdb1ff6c5c68045 100644 --- a/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf +++ b/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf @@ -10,6 +10,9 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_CBPRINTF_REDUCED_INTEGRAL=y CONFIG_BT=y +CONFIG_BT_OBSERVER=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=4