From 32a02459dca3131dba846b1ef6e9acf5f935fd0b Mon Sep 17 00:00:00 2001 From: Rahul Tank Date: Thu, 16 Feb 2023 19:56:41 +0530 Subject: [PATCH] Nimble: Update example configuration to enable ext adv feature only for BLE5.0 supported chips --- components/bt/host/nimble/Kconfig.in | 2 +- components/soc/esp32c2/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32c2/include/soc/soc_caps.h | 1 + components/soc/esp32c3/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32c3/include/soc/soc_caps.h | 1 + components/soc/esp32h2/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32h2/include/soc/soc_caps.h | 1 + components/soc/esp32s3/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32s3/include/soc/soc_caps.h | 1 + .../nimble/ble_l2cap_coc/coc_blecent/main/Kconfig.projbuild | 3 ++- .../nimble/ble_l2cap_coc/coc_bleprph/main/Kconfig.projbuild | 3 ++- .../bluetooth/nimble/ble_periodic_adv/main/Kconfig.projbuild | 3 ++- .../bluetooth/nimble/ble_periodic_sync/main/Kconfig.projbuild | 3 ++- .../bluetooth/nimble/ble_phy/phy_cent/main/Kconfig.projbuild | 3 ++- .../bluetooth/nimble/ble_phy/phy_prph/main/Kconfig.projbuild | 3 ++- examples/bluetooth/nimble/blecent/main/Kconfig.projbuild | 3 ++- examples/bluetooth/nimble/bleprph/main/Kconfig.projbuild | 3 ++- 17 files changed, 37 insertions(+), 9 deletions(-) diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in index 204e5cc0c8..d2ee91f73e 100644 --- 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 diff --git a/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in index dcd60ec778..502aa04b9a 100644 --- 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 diff --git a/components/soc/esp32c2/include/soc/soc_caps.h b/components/soc/esp32c2/include/soc/soc_caps.h index 64144c4fd5..d9ddf645e0 100644 --- 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 */ diff --git a/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in index 0272a5d671..ddb8e16f1f 100644 --- 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 diff --git a/components/soc/esp32c3/include/soc/soc_caps.h b/components/soc/esp32c3/include/soc/soc_caps.h index b16cfe393d..18f69561f3 100644 --- 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 */ diff --git a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in index f1b7e9521b..65bad0061d 100644 --- 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 diff --git a/components/soc/esp32h2/include/soc/soc_caps.h b/components/soc/esp32h2/include/soc/soc_caps.h index c3a1f5436d..a85f1ae429 100644 --- 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 */ diff --git a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in index 6cdfe622db..cb8ca4179f 100644 --- 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 diff --git a/components/soc/esp32s3/include/soc/soc_caps.h b/components/soc/esp32s3/include/soc/soc_caps.h index 68b191c3da..e3ee515c53 100644 --- 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 */ 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 index e142a26c82..5397f94ed5 100644 --- 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 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 index 28393e4eb7..e7a2f95602 100644 --- 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 diff --git a/examples/bluetooth/nimble/ble_periodic_adv/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_periodic_adv/main/Kconfig.projbuild index 46004b8005..37a6fb825d 100644 --- 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 diff --git a/examples/bluetooth/nimble/ble_periodic_sync/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_periodic_sync/main/Kconfig.projbuild index c2a5a3d69a..7bbaeb5486 100644 --- 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 diff --git a/examples/bluetooth/nimble/ble_phy/phy_cent/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_phy/phy_cent/main/Kconfig.projbuild index f491ef56ad..3e8b65b83f 100644 --- 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 diff --git a/examples/bluetooth/nimble/ble_phy/phy_prph/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_phy/phy_prph/main/Kconfig.projbuild index 3488cd409e..58c8303b5c 100644 --- 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 diff --git a/examples/bluetooth/nimble/blecent/main/Kconfig.projbuild b/examples/bluetooth/nimble/blecent/main/Kconfig.projbuild index 33a8e0da09..a3d11a1b65 100644 --- 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 diff --git a/examples/bluetooth/nimble/bleprph/main/Kconfig.projbuild b/examples/bluetooth/nimble/bleprph/main/Kconfig.projbuild index 36f6b60f66..1d64cdde2c 100644 --- 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