diff --git a/samples/bluetooth/bap_broadcast_sink/prj.conf b/samples/bluetooth/bap_broadcast_sink/prj.conf index 728c2a9f2cdcc4b..ee5d6155bd1f749 100644 --- a/samples/bluetooth/bap_broadcast_sink/prj.conf +++ b/samples/bluetooth/bap_broadcast_sink/prj.conf @@ -6,6 +6,7 @@ CONFIG_BT_PAC_SNK=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_BAP_BROADCAST_SINK=y CONFIG_BT_BAP_SCAN_DELEGATOR=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_ISO_MAX_CHAN=2 # Allocate 2 RX buffers per channel CONFIG_BT_ISO_RX_BUF_COUNT=4 diff --git a/samples/bluetooth/cap_acceptor/prj.conf b/samples/bluetooth/cap_acceptor/prj.conf index fb4a13850cec598..b3e91bd50675b6a 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/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/mesh/prj.conf b/samples/bluetooth/mesh/prj.conf index 9c8daad91316c3b..f213a0a2f09a8fe 100644 --- a/samples/bluetooth/mesh/prj.conf +++ b/samples/bluetooth/mesh/prj.conf @@ -12,6 +12,7 @@ CONFIG_BT_L2CAP_TX_BUF_COUNT=5 CONFIG_BT_PERIPHERAL=y CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_CTLR_LE_ENC=n diff --git a/samples/bluetooth/pbp_public_broadcast_sink/prj.conf b/samples/bluetooth/pbp_public_broadcast_sink/prj.conf index 0feae717a7777a3..04eb01fe4023e72 100644 --- a/samples/bluetooth/pbp_public_broadcast_sink/prj.conf +++ b/samples/bluetooth/pbp_public_broadcast_sink/prj.conf @@ -15,6 +15,7 @@ CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_SIZE=196 CONFIG_BT_CAP_ACCEPTOR=y # BAP support +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_BAP_SCAN_DELEGATOR=y CONFIG_BT_BAP_BROADCAST_SINK=y CONFIG_BT_BAP_BROADCAST_SNK_SUBGROUP_COUNT=1 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/boards/nordic/mesh/onoff-app/prj.conf b/samples/boards/nordic/mesh/onoff-app/prj.conf index e6f744fb95ab2f8..8cbcbd15012ee1a 100644 --- a/samples/boards/nordic/mesh/onoff-app/prj.conf +++ b/samples/boards/nordic/mesh/onoff-app/prj.conf @@ -29,6 +29,7 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT=y CONFIG_BT_TINYCRYPT_ECC=y CONFIG_BT_L2CAP_TX_BUF_COUNT=8 +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_MESH=y CONFIG_BT_MESH_RELAY=y diff --git a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf index f23b4dc2a304b98..a15d3992aa9f6ce 100644 --- a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf +++ b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf @@ -25,6 +25,7 @@ CONFIG_BT=y CONFIG_BT_TINYCRYPT_ECC=y CONFIG_BT_RX_STACK_SIZE=4096 CONFIG_BT_L2CAP_TX_BUF_COUNT=8 +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_MESH=y CONFIG_BT_MESH_RELAY=y diff --git a/subsys/bluetooth/audio/Kconfig.bap b/subsys/bluetooth/audio/Kconfig.bap index 37b2f12bd78b345..daa8f91157185ad 100644 --- a/subsys/bluetooth/audio/Kconfig.bap +++ b/subsys/bluetooth/audio/Kconfig.bap @@ -166,7 +166,7 @@ config BT_BAP_BROADCAST_SINK bool "Bluetooth Broadcast Sink Audio Support" select BT_ISO_SYNC_RECEIVER select BT_AUDIO_RX - select BT_PAC_SNK + depends on BT_PAC_SNK depends on BT_PERIPHERAL depends on BT_BAP_SCAN_DELEGATOR help @@ -211,7 +211,7 @@ config BT_BAP_SCAN_DELEGATOR select BT_EXT_ADV select BT_PER_ADV_SYNC select BT_ISO_SYNC_RECEIVER - select BT_GATT_DYNAMIC_DB + depends on BT_GATT_DYNAMIC_DB depends on BT_BONDABLE help This option enables support for the Scan Delegator role and the 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/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig index 384033f79083e84..7913500b39675b9 100644 --- a/subsys/bluetooth/mesh/Kconfig +++ b/subsys/bluetooth/mesh/Kconfig @@ -37,7 +37,7 @@ config BT_MESH_GATT_CLIENT config BT_MESH_GATT_SERVER bool select BT_MESH_GATT - select BT_GATT_DYNAMIC_DB + depends on BT_GATT_DYNAMIC_DB config BT_MESH_PB_GATT_COMMON bool diff --git a/tests/bluetooth/audio/bap_base/prj.conf b/tests/bluetooth/audio/bap_base/prj.conf index 8d51961ad57229b..375299bd2136089 100644 --- a/tests/bluetooth/audio/bap_base/prj.conf +++ b/tests/bluetooth/audio/bap_base/prj.conf @@ -6,6 +6,7 @@ CONFIG_BT_AUDIO=y CONFIG_BT_PERIPHERAL=y # Need to enable one broadcast role to enable CONFIG_BT_BAP_BASE CONFIG_BT_BAP_SCAN_DELEGATOR=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_LOG=y CONFIG_BT_AUDIO_LOG_LEVEL_DBG=y diff --git a/tests/bluetooth/mesh/basic/dbg.conf b/tests/bluetooth/mesh/basic/dbg.conf index 6933c402ac6c278..a34f0107785e811 100644 --- a/tests/bluetooth/mesh/basic/dbg.conf +++ b/tests/bluetooth/mesh/basic/dbg.conf @@ -17,6 +17,7 @@ CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y CONFIG_BT=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_MESH=y CONFIG_BT_MESH_RELAY=y diff --git a/tests/bluetooth/mesh/basic/gatt.conf b/tests/bluetooth/mesh/basic/gatt.conf index 9bff7bfcef6564e..ce3c14b5dd73c0f 100644 --- a/tests/bluetooth/mesh/basic/gatt.conf +++ b/tests/bluetooth/mesh/basic/gatt.conf @@ -15,6 +15,7 @@ CONFIG_BT_CTLR_MIN_USED_CHAN=n CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT=y diff --git a/tests/bluetooth/mesh/basic/lpn.conf b/tests/bluetooth/mesh/basic/lpn.conf index 6edaa9af8a940f4..9620b4479ce2a87 100644 --- a/tests/bluetooth/mesh/basic/lpn.conf +++ b/tests/bluetooth/mesh/basic/lpn.conf @@ -15,6 +15,7 @@ CONFIG_BT_CTLR_MIN_USED_CHAN=n CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT=y diff --git a/tests/bluetooth/mesh/basic/multi_ext_adv.conf b/tests/bluetooth/mesh/basic/multi_ext_adv.conf index 634973154c34809..c4da6780c5024ca 100644 --- a/tests/bluetooth/mesh/basic/multi_ext_adv.conf +++ b/tests/bluetooth/mesh/basic/multi_ext_adv.conf @@ -14,6 +14,7 @@ CONFIG_BT_CTLR_MIN_USED_CHAN=n CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT=y diff --git a/tests/bluetooth/mesh/basic/pb_gatt.conf b/tests/bluetooth/mesh/basic/pb_gatt.conf index 91a76b35c06f705..de1a1d104b37705 100644 --- a/tests/bluetooth/mesh/basic/pb_gatt.conf +++ b/tests/bluetooth/mesh/basic/pb_gatt.conf @@ -15,6 +15,7 @@ CONFIG_BT_CTLR_MIN_USED_CHAN=n CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT=y diff --git a/tests/bluetooth/mesh/basic/prj.conf b/tests/bluetooth/mesh/basic/prj.conf index 825d1be6e9ab896..f8e45f686ef3325 100644 --- a/tests/bluetooth/mesh/basic/prj.conf +++ b/tests/bluetooth/mesh/basic/prj.conf @@ -15,6 +15,7 @@ CONFIG_BT_CTLR_MIN_USED_CHAN=n CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT=y diff --git a/tests/bluetooth/mesh/basic/proxy.conf b/tests/bluetooth/mesh/basic/proxy.conf index b13a46143bcbb74..c02bfacf7985c31 100644 --- a/tests/bluetooth/mesh/basic/proxy.conf +++ b/tests/bluetooth/mesh/basic/proxy.conf @@ -15,6 +15,7 @@ CONFIG_BT_CTLR_MIN_USED_CHAN=n CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT=y diff --git a/tests/bluetooth/mesh_shell/prj.conf b/tests/bluetooth/mesh_shell/prj.conf index bb4c878bdfdfbf0..6f0de238a6340dd 100644 --- a/tests/bluetooth/mesh_shell/prj.conf +++ b/tests/bluetooth/mesh_shell/prj.conf @@ -20,6 +20,7 @@ CONFIG_BT_OBSERVER=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_DEVICE_NAME="Zephyr Mesh" CONFIG_BT_GATT_CACHING=n +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_CTLR_LE_ENC=n diff --git a/tests/bluetooth/shell/audio.conf b/tests/bluetooth/shell/audio.conf index 2a2ff06dd4e6d58..0bc616558831683 100644 --- a/tests/bluetooth/shell/audio.conf +++ b/tests/bluetooth/shell/audio.conf @@ -140,6 +140,7 @@ CONFIG_BT_OTS_SECONDARY_SVC=y CONFIG_BT_OTS_MAX_OBJ_CNT=0x30 CONFIG_BT_OTS_CLIENT=y +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_BAP_SCAN_DELEGATOR=y CONFIG_BT_BAP_BASS_MAX_SUBGROUPS=2 CONFIG_BT_AUDIO_CODEC_CFG_MAX_METADATA_SIZE=255 @@ -168,6 +169,7 @@ CONFIG_BT_TMAP=y # Public Broadcast Profile CONFIG_BT_PBP=y +CONFIG_BT_PAC_SNK=y CONFIG_BT_PACS_SUPPORTED_CONTEXT_NOTIFIABLE=y CONFIG_BT_PAC_SNK_LOC_NOTIFIABLE=y CONFIG_BT_PAC_SRC_LOC_NOTIFIABLE=y diff --git a/tests/bluetooth/tester/overlay-le-audio.conf b/tests/bluetooth/tester/overlay-le-audio.conf index 22e5c5ba6bb8300..79bf923217ddbf3 100644 --- a/tests/bluetooth/tester/overlay-le-audio.conf +++ b/tests/bluetooth/tester/overlay-le-audio.conf @@ -41,6 +41,7 @@ CONFIG_BT_ISO_TX_BUF_COUNT=4 CONFIG_BT_BAP_BROADCAST_ASSISTANT=y # Broadcast Sink +CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_BAP_SCAN_DELEGATOR=y CONFIG_BT_BAP_BROADCAST_SINK=y CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT=2 @@ -63,6 +64,7 @@ CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=2 CONFIG_BT_ISO_MAX_CHAN=4 # PACS +CONFIG_BT_PAC_SNK=y CONFIG_BT_PAC_SNK_LOC_WRITEABLE=y CONFIG_BT_PAC_SRC_LOC_WRITEABLE=y CONFIG_BT_PAC_SNK_LOC_NOTIFIABLE=y diff --git a/tests/bsim/bluetooth/mesh/prj.conf b/tests/bsim/bluetooth/mesh/prj.conf index 156b12496758f7a..8a3f76082dec47b 100644 --- a/tests/bsim/bluetooth/mesh/prj.conf +++ b/tests/bsim/bluetooth/mesh/prj.conf @@ -10,6 +10,7 @@ CONFIG_BT_COMPANY_ID=0x0059 CONFIG_BT_DEVICE_NAME="Mesh test" CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y +CONFIG_BT_GATT_DYNAMIC_DB=y # Disable unused Bluetooth features CONFIG_BT_CTLR_DUP_FILTER_LEN=0