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 zephyrproject-rtos#79108 Signed-off-by: Babak Arisian <bbaa@demant.com>
babrsn · Oct 4, 2024 · 5d6a4b7 · 5d6a4b7
1 parent e1cacb3
commit 5d6a4b7
Show file tree

Hide file tree

Showing 23 changed files with 26 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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