Merge branch 'bugfix/fix_example_menuconfig_error_v5.3' into 'release/v5.3'

rahult-github · rahult-github · commit 14135f9def77 · 2024-07-25T17:30:25.000+08:00
fix(nimble): Update menuconfig option to consider 5.0 support (v5.3)

See merge request espressif/esp-idf!32035
diff --git a/examples/bluetooth/nimble/ble_cts/cts_cent/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_cts/cts_cent/main/Kconfig.projbuild
@@ -15,7 +15,7 @@ menu "Example Configuration"
 
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
diff --git a/examples/bluetooth/nimble/ble_cts/cts_prph/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_cts/cts_prph/main/Kconfig.projbuild
@@ -2,7 +2,7 @@ menu "Example Configuration"
 
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
diff --git a/examples/bluetooth/nimble/ble_htp/htp_cent/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_htp/htp_cent/main/Kconfig.projbuild
@@ -15,7 +15,7 @@ menu "Example Configuration"
 
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
diff --git a/examples/bluetooth/nimble/ble_htp/htp_prph/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_htp/htp_prph/main/Kconfig.projbuild
@@ -2,7 +2,7 @@ menu "Example Configuration"
 
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
diff --git a/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/Kconfig.projbuild
@@ -8,7 +8,7 @@ menu "Example Configuration"
 
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
diff --git a/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/Kconfig.projbuild
@@ -50,7 +50,7 @@ menu "Example Configuration"
 
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
diff --git a/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/main/Kconfig.projbuild
@@ -2,7 +2,7 @@ menu "Example Configuration"
 
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
diff --git a/examples/bluetooth/nimble/ble_periodic_adv/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_periodic_adv/main/Kconfig.projbuild
@@ -2,7 +2,7 @@ menu "Example Configuration"
 
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
diff --git a/examples/bluetooth/nimble/ble_periodic_sync/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_periodic_sync/main/Kconfig.projbuild
@@ -1,7 +1,7 @@
 menu "Example Configuration"
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
diff --git a/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/main/Kconfig.projbuild
@@ -15,7 +15,7 @@ menu "Example Configuration"
 
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
diff --git a/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_prph/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_prph/main/Kconfig.projbuild
@@ -2,7 +2,7 @@ menu "Example Configuration"
 
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
diff --git a/examples/bluetooth/nimble/blecent/main/Kconfig.projbuild b/examples/bluetooth/nimble/blecent/main/Kconfig.projbuild
@@ -8,7 +8,7 @@ menu "Example Configuration"
 
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
diff --git a/examples/bluetooth/nimble/bleprph/main/Kconfig.projbuild b/examples/bluetooth/nimble/bleprph/main/Kconfig.projbuild
@@ -50,7 +50,7 @@ menu "Example Configuration"
 
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
diff --git a/examples/bluetooth/nimble/bleprph_host_only/main/Kconfig.projbuild b/examples/bluetooth/nimble/bleprph_host_only/main/Kconfig.projbuild
@@ -110,7 +110,7 @@ menu "Example Configuration"
 
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
diff --git a/examples/bluetooth/nimble/power_save/main/Kconfig.projbuild b/examples/bluetooth/nimble/power_save/main/Kconfig.projbuild
@@ -129,7 +129,7 @@ menu "Example Configuration"
 
     config EXAMPLE_EXTENDED_ADV
         bool
-        depends on SOC_BLE_50_SUPPORTED
+        depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
         default y if SOC_ESP_NIMBLE_CONTROLLER
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
