Merge branch 'bugfix/fix_ext_adv_compilation_issue_v5.0' into 'releas…

…e/v5.0' Nimble: Fix compilation issue for examples for esp32c6 and esp32h4 (v5.0) See merge request espressif/esp-idf!22066
espressif · Feb 27, 2023 · a9af208 · a9af208
2 parents 4abb6ef + e7eccf7
commit a9af208
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 2 deletions.
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
@@ -9,6 +9,7 @@ menu "Example Configuration"
     config EXAMPLE_EXTENDED_ADV
         bool
         default y if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
         prompt "Enable Extended Adv"
         help
             Use this option to enable extended advertising in the example

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

diff --git a/examples/bluetooth/nimble/ble_periodic_adv/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_periodic_adv/main/Kconfig.projbuild
@@ -3,6 +3,7 @@ menu "Example Configuration"
     config EXAMPLE_EXTENDED_ADV
         bool
         default y if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
         prompt "Enable Extended Adv"
         help
             Use this option to enable extended advertising in the example

diff --git a/examples/bluetooth/nimble/ble_periodic_sync/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_periodic_sync/main/Kconfig.projbuild
@@ -2,6 +2,7 @@ menu "Example Configuration"
     config EXAMPLE_EXTENDED_ADV
         bool
         default y if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
         prompt "Enable Extended Adv"
         help
             Use this option to enable extended advertising in the example

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

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

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

diff --git a/examples/bluetooth/nimble/bleprph/main/Kconfig.projbuild b/examples/bluetooth/nimble/bleprph/main/Kconfig.projbuild
@@ -51,6 +51,7 @@ menu "Example Configuration"
     config EXAMPLE_EXTENDED_ADV
         bool
         default y if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
         prompt "Enable Extended Adv"
         help
             Use this option to enable extended advertising in the example