Bluetooth: Audio: Add dependency for BT_SMP

Thalley · kartben · commit b72b33a8bcd8 · 2025-02-05T14:57:20.000+01:00
Add dependency for BT_SMP for the services and
service clients that require encryption.

Signed-off-by: Emil Gydesen &lt;emil.gydesen@nordicsemi.no&gt;
diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst
@@ -488,6 +488,10 @@ Bluetooth Audio
   be called. All Kconfig options still remain. Runtime configuration cannot override a disabled
   Kconfig option. (:github:`83730`)
 
+* Several services and service client (AICS, ASCS, CSIP, HAS, MCS, PACS, TBS, VCP and VOCS) now
+  depend on :kconfig:option:`CONFIG_BT_SMP` and may need to be explicitly enabled.
+  (:github:`84994``)
+
 Bluetooth Classic
 =================
 
diff --git a/subsys/bluetooth/audio/Kconfig.aics b/subsys/bluetooth/audio/Kconfig.aics
@@ -10,6 +10,7 @@
 
 config BT_AICS_MAX_INSTANCE_COUNT
 	int "Audio Input Control Service max instance count"
+	depends on BT_SMP
 	default 0
 	range 0 15
 	help
@@ -38,6 +39,7 @@ endif # BT_AICS
 
 config BT_AICS_CLIENT_MAX_INSTANCE_COUNT
 	int "Audio Input Control Service client max instance count"
+	depends on BT_SMP
 	default 0
 	range 0 15
 	help
diff --git a/subsys/bluetooth/audio/Kconfig.ascs b/subsys/bluetooth/audio/Kconfig.ascs
@@ -8,6 +8,7 @@
 
 config BT_ASCS
 	bool "Audio Stream Control Service Support"
+	depends on BT_SMP
 	help
 	  This option enables support for Audio Stream Control Service.
 
diff --git a/subsys/bluetooth/audio/Kconfig.csip b/subsys/bluetooth/audio/Kconfig.csip
@@ -10,6 +10,8 @@
 
 config BT_CSIP_SET_MEMBER
 	bool "Coordinated Set Identification Profile Set Member support"
+	depends on BT_GATT_DYNAMIC_DB
+	depends on BT_SMP
 	imply BT_EXT_ADV if BT_PRIVACY
 	help
 	  This option enables support for Coordinated Set Identification
@@ -59,6 +61,7 @@ config BT_CSIP_SET_COORDINATOR
 	bool "Coordinated Set Identification Profile Set Coordinator Support"
 	depends on BT_GATT_CLIENT
 	depends on BT_GATT_AUTO_DISCOVER_CCC
+	depends on BT_SMP
 	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
@@ -60,5 +60,6 @@ config BT_HAS_CLIENT
 	depends on BT_GATT_CLIENT
 	depends on BT_GATT_AUTO_DISCOVER_CCC
 	depends on BT_GATT_AUTO_UPDATE_MTU
+	depends on BT_SMP
 	help
 	  This option enables support for Hearing Access Service Client.
diff --git a/subsys/bluetooth/audio/Kconfig.mcs b/subsys/bluetooth/audio/Kconfig.mcs
@@ -13,6 +13,7 @@ config BT_MCS
 	depends on MCTL_LOCAL_PLAYER_REMOTE_CONTROL
 	depends on UTF8
 	depends on BT_GATT_DYNAMIC_DB
+	depends on BT_SMP
 	help
 	  This option enables support for the Media Control Service.
 
@@ -22,6 +23,7 @@ config BT_MCC
 	bool "Media Control Client Support"
 	depends on BT_GATT_CLIENT
 	depends on BT_GATT_AUTO_DISCOVER_CCC
+	depends on BT_SMP
 	help
 	  This option enables support for the Media Control Client.
 
diff --git a/subsys/bluetooth/audio/Kconfig.pacs b/subsys/bluetooth/audio/Kconfig.pacs
@@ -9,6 +9,8 @@ menu "Published Audio Capabilities (PAC) options"
 
 config BT_PAC_SNK
 	bool "Sink PAC Characteristic Support"
+	depends on BT_GATT_DYNAMIC_DB
+	depends on BT_SMP
 	help
 	  This option enables support for Sink Published Audio Capabilities.
 
@@ -43,6 +45,7 @@ endif # BT_PACS_SNK
 
 config BT_PAC_SRC
 	bool "Source PAC Characteristic Support"
+	depends on BT_GATT_DYNAMIC_DB
 	help
 	  This option enables support for Source Published Audio Capabilities.
 
diff --git a/subsys/bluetooth/audio/Kconfig.tbs b/subsys/bluetooth/audio/Kconfig.tbs
@@ -13,6 +13,7 @@ if BT_AUDIO
 config BT_TBS
 	bool "Telephone Bearer Service Support"
 	depends on BT_GATT_DYNAMIC_DB
+	depends on BT_SMP
 	depends on UTF8
 	help
 	  This option enables support for Telephone Bearer Service. By default this only
@@ -58,20 +59,24 @@ endif # BT_TBS
 
 config BT_TBS_CLIENT_GTBS
 	bool "Generic Telephone Bearer Service client support"
+	depends on BT_GATT_CLIENT
+	depends on BT_GATT_AUTO_DISCOVER_CCC
+	depends on BT_SMP
 	depends on UTF8
 	help
 	  This option enables support for the GTBS-oriented Call Control client.
 
 config BT_TBS_CLIENT_TBS
 	bool "Telephone Bearer Service client support"
+	depends on BT_GATT_CLIENT
+	depends on BT_GATT_AUTO_DISCOVER_CCC
+	depends on BT_SMP
 	depends on UTF8
 	help
 	  This option enables support for the TBS-oriented Call Control client.
 
 config BT_TBS_CLIENT
 	def_bool BT_TBS_CLIENT_GTBS || BT_TBS_CLIENT_TBS
-	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
@@ -11,6 +11,7 @@
 config BT_VCP_VOL_REND
 	bool "Volume Control Profile Volume Renderer Support"
 	depends on BT_GATT_DYNAMIC_DB
+	depends on BT_SMP
 	help
 	  This option enables support for Volume Control Profile Volume Renderer
 	  role and the Volume Control Service.
@@ -60,6 +61,7 @@ config BT_VCP_VOL_CTLR
 	bool "Volume Control Profile Volume Controller Support"
 	depends on BT_GATT_CLIENT
 	depends on BT_GATT_AUTO_DISCOVER_CCC
+	depends on BT_SMP
 	help
 	  This option enables support for Volume Control Profile Volume
 	  Controller.
diff --git a/subsys/bluetooth/audio/Kconfig.vocs b/subsys/bluetooth/audio/Kconfig.vocs
@@ -9,6 +9,7 @@
 
 config BT_VOCS_MAX_INSTANCE_COUNT
 	int "Volume Offset Control Service max instance count"
+	depends on BT_SMP
 	default 0
 	range 0 15
 	help
@@ -36,6 +37,7 @@ endif # BT_VOCS
 
 config BT_VOCS_CLIENT_MAX_INSTANCE_COUNT
 	int "Volume Offset Control Service client max instance count"
+	depends on BT_SMP
 	default 0
 	range 0 15
 	help
