Merge branch 'bugfix/modify_configuration_for_ble_5_v5.0' into 'release/v5.0'

Nimble: Update example configuration to enable ext adv feature only for BLE5.0 supported chips (v5.0) See merge request espressif/esp-idf!22780
2024-10-05 20:47:46 -04:00 · 2023-03-17 13:56:22 +08:00 · 2023-03-17 13:56:22 +08:00 · df0ec3f5e4
commit df0ec3f5e4
parent b837e910a9 32a02459dc
17 changed files with 37 additions and 9 deletions
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@ -503,7 +503,7 @@ config BT_NIMBLE_MAX_CONN_REATTEMPT

 menuconfig BT_NIMBLE_50_FEATURE_SUPPORT
    bool "Enable BLE 5 feature"
-    depends on BT_NIMBLE_ENABLED
+    depends on BT_NIMBLE_ENABLED && (SOC_BLE_50_SUPPORTED || !BT_CONTROLLER_ENABLED)
    default y
    help
            Enable BLE 5 feature
--- a/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in
@ -594,3 +594,7 @@ config SOC_BLE_MESH_SUPPORTED
 config SOC_ESP_NIMBLE_CONTROLLER
    bool
    default y
+
+config SOC_BLE_50_SUPPORTED
+    bool
+    default y
--- a/components/soc/esp32c2/include/soc/soc_caps.h
+++ b/components/soc/esp32c2/include/soc/soc_caps.h
@ -288,3 +288,4 @@
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_MESH_SUPPORTED          (0)    /*!< Support BLE MESH */
 #define SOC_ESP_NIMBLE_CONTROLLER       (1)    /*!< Support BLE EMBEDDED controller V1 */
+#define SOC_BLE_50_SUPPORTED            (1)    /*!< Support Bluetooth 5.0 */
--- a/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in
@ -842,3 +842,7 @@ config SOC_BLE_SUPPORTED
 config SOC_BLE_MESH_SUPPORTED
    bool
    default y
+
+config SOC_BLE_50_SUPPORTED
+    bool
+    default y
--- a/components/soc/esp32c3/include/soc/soc_caps.h
+++ b/components/soc/esp32c3/include/soc/soc_caps.h
@ -387,3 +387,4 @@
 /*---------------------------------- Bluetooth CAPS ----------------------------------*/
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_MESH_SUPPORTED          (1)    /*!< Support BLE MESH */
+#define SOC_BLE_50_SUPPORTED		(1)    /*!< Support Bluetooth 5.0 */
--- a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in
@ -774,3 +774,7 @@ config SOC_BLE_MESH_SUPPORTED
 config SOC_ESP_NIMBLE_CONTROLLER
    bool
    default y
+
+config SOC_BLE_50_SUPPORTED
+    bool
+    default y
--- a/components/soc/esp32h2/include/soc/soc_caps.h
+++ b/components/soc/esp32h2/include/soc/soc_caps.h
@ -372,3 +372,4 @@
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_MESH_SUPPORTED          (1)    /*!< Support BLE MESH */
 #define SOC_ESP_NIMBLE_CONTROLLER       (1)    /*!< Support BLE EMBEDDED controller V1 */
+#define SOC_BLE_50_SUPPORTED            (1)    /*!< Support Bluetooth 5.0 */
--- a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
@ -1079,6 +1079,10 @@ config SOC_BLE_MESH_SUPPORTED
    bool
    default y

+config SOC_BLE_50_SUPPORTED
+    bool
+    default y
+
 config SOC_TWAI_BRP_MIN
    int
    default 2
--- a/components/soc/esp32s3/include/soc/soc_caps.h
+++ b/components/soc/esp32s3/include/soc/soc_caps.h
@ -455,3 +455,4 @@
 /*---------------------------------- Bluetooth CAPS ----------------------------------*/
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_MESH_SUPPORTED          (1)    /*!< Support BLE MESH */
+#define SOC_BLE_50_SUPPORTED            (1)    /*!< Support Bluetooth 5.0 */
--- 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,8 +8,9 @@ menu "Example Configuration"

    config EXAMPLE_EXTENDED_ADV
        bool
+        depends on SOC_BLE_50_SUPPORTED
        default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
        prompt "Enable Extended Adv"
        help
            Use this option to enable extended advertising in the example
--- 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,8 +50,9 @@ menu "Example Configuration"

    config EXAMPLE_EXTENDED_ADV
        bool
+        depends on SOC_BLE_50_SUPPORTED
        default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
        prompt "Enable Extended Adv"
        help
            Use this option to enable extended advertising in the example
--- a/examples/bluetooth/nimble/ble_periodic_adv/main/Kconfig.projbuild
+++ b/examples/bluetooth/nimble/ble_periodic_adv/main/Kconfig.projbuild
@ -2,8 +2,9 @@ menu "Example Configuration"

    config EXAMPLE_EXTENDED_ADV
        bool
+        depends on SOC_BLE_50_SUPPORTED
        default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
        prompt "Enable Extended Adv"
        help
            Use this option to enable extended advertising in the example
--- a/examples/bluetooth/nimble/ble_periodic_sync/main/Kconfig.projbuild
+++ b/examples/bluetooth/nimble/ble_periodic_sync/main/Kconfig.projbuild
@ -1,8 +1,9 @@
 menu "Example Configuration"
    config EXAMPLE_EXTENDED_ADV
        bool
+        depends on SOC_BLE_50_SUPPORTED
        default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
        prompt "Enable Extended Adv"
        help
            Use this option to enable extended advertising in the example
--- a/examples/bluetooth/nimble/ble_phy/phy_cent/main/Kconfig.projbuild
+++ b/examples/bluetooth/nimble/ble_phy/phy_cent/main/Kconfig.projbuild
@ -8,8 +8,9 @@ menu "Example Configuration"

    config EXAMPLE_EXTENDED_ADV
        bool
+        depends on SOC_BLE_50_SUPPORTED
        default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
        prompt "Enable Extended Adv"
        help
            Use this option to enable extended advertising in the example
--- a/examples/bluetooth/nimble/ble_phy/phy_prph/main/Kconfig.projbuild
+++ b/examples/bluetooth/nimble/ble_phy/phy_prph/main/Kconfig.projbuild
@ -47,8 +47,9 @@ menu "Example Configuration"

    config EXAMPLE_EXTENDED_ADV
        bool
+        depends on SOC_BLE_50_SUPPORTED
        default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
        prompt "Enable Extended Adv"
        help
            Use this option to enable extended advertising in the example
--- a/examples/bluetooth/nimble/blecent/main/Kconfig.projbuild
+++ b/examples/bluetooth/nimble/blecent/main/Kconfig.projbuild
@ -8,8 +8,9 @@ menu "Example Configuration"

    config EXAMPLE_EXTENDED_ADV
        bool
+        depends on SOC_BLE_50_SUPPORTED
        default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
        prompt "Enable Extended Adv"
        help
            Use this option to enable extended advertising in the example
--- a/examples/bluetooth/nimble/bleprph/main/Kconfig.projbuild
+++ b/examples/bluetooth/nimble/bleprph/main/Kconfig.projbuild
@ -50,8 +50,9 @@ menu "Example Configuration"

    config EXAMPLE_EXTENDED_ADV
        bool
+        depends on SOC_BLE_50_SUPPORTED
        default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
        prompt "Enable Extended Adv"
        help
            Use this option to enable extended advertising in the example