Merge branch 'bugfix/btdm_link_error_of_kconfig' into 'master'

Bugfix/btdm link error of kconfig

See merge request espressif/esp-idf!15176

components/bt/Kconfig

@@ -7,42 +7,16 @@ menu "Bluetooth"
         help
             Select this option to enable Bluetooth and show the submenu with Bluetooth configuration choices.
 
-    config BT_CTRL_ESP32
-        bool
-        depends on BT_ENABLED && IDF_TARGET_ESP32
-        default y
-
-    config BT_CTRL_ESP32C3
-        bool
-        depends on BT_ENABLED && IDF_TARGET_ESP32C3
-        default y
-    config BT_CTRL_ESP32S3
-        bool
-        depends on BT_ENABLED && IDF_TARGET_ESP32S3
-        default y
-
     config BT_SOC_SUPPORT_5_0
         bool
         depends on BT_ENABLED && (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3)
         default y if BT_ENABLED && (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3)
         default n
 
-    menu "Bluetooth controller(ESP32 Dual Mode Bluetooth)"
-        visible if BT_CTRL_ESP32
-
-        source "$IDF_PATH/components/bt/controller/esp32/Kconfig.in"
-    endmenu
-
-    menu "Bluetooth controller(ESP32C3 Bluetooth Low Energy)"
-        visible if BT_CTRL_ESP32C3
-
-        source "$IDF_PATH/components/bt/controller/esp32c3/Kconfig.in"
-    endmenu
-
-    menu "Bluetooth controller(ESP32S3 Bluetooth Low Energy)"
-        visible if BT_CTRL_ESP32S3
+    menu "Bluetooth controller"
+        depends on BT_ENABLED
 
-        source "$IDF_PATH/components/bt/controller/esp32s3/Kconfig.in"
+        source "$IDF_PATH/components/bt/controller/$IDF_TARGET/Kconfig.in"
     endmenu
 
     choice BT_HOST
@@ -73,12 +47,12 @@ menu "Bluetooth"
     endchoice
 
     menu "Bluedroid Options"
-        visible if BT_BLUEDROID_ENABLED
+        depends on BT_BLUEDROID_ENABLED
 
         source "$IDF_PATH/components/bt/host/bluedroid/Kconfig.in"
     endmenu
     menu "NimBLE Options"
-        visible if BT_NIMBLE_ENABLED
+        depends on BT_NIMBLE_ENABLED
 
         source "$IDF_PATH/components/bt/host/nimble/Kconfig.in"
     endmenu

components/bt/controller/esp32/Kconfig.in

@@ -1,6 +1,5 @@
 choice BTDM_CTRL_MODE
     prompt "Bluetooth controller mode (BR/EDR/BLE/DUALMODE)"
-    depends on BT_CTRL_ESP32
     help
         Specify the bluetooth controller mode (BR/EDR, BLE or dual mode).
 
@@ -152,7 +151,7 @@ config BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF
 
 choice BTDM_CTRL_PINNED_TO_CORE_CHOICE
     prompt "The cpu core which bluetooth controller run"
-    depends on BT_CTRL_ESP32 && !FREERTOS_UNICORE
+    depends on !FREERTOS_UNICORE
     help
         Specify the cpu core to run bluetooth controller.
         Can not specify no-affinity.
@@ -172,7 +171,6 @@ config BTDM_CTRL_PINNED_TO_CORE
 
 choice BTDM_CTRL_HCI_MODE_CHOICE
     prompt "HCI mode"
-    depends on BT_CTRL_ESP32
     help
         Speicify HCI mode as VHCI or UART(H4)
 
@@ -210,11 +208,8 @@ menu "HCI UART(H4) Options"
 endmenu
 
 menu "MODEM SLEEP Options"
-    visible if BT_CTRL_ESP32
-
     config BTDM_CTRL_MODEM_SLEEP
         bool "Bluetooth modem sleep"
-        depends on BT_CTRL_ESP32
         default y
         help
             Enable/disable bluetooth controller low power mode.
@@ -416,6 +411,12 @@ config BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD
         If you set `BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD` to a small value or printf every adv lost event, it
         may cause adv packets lost more.
 
+
+config BTDM_RESERVE_DRAM
+    hex
+    default 0xdb5c if BT_ENABLED
+    default 0
+
 config BTDM_CTRL_HLI
     bool "High level interrupt"
     depends on BT_ENABLED

components/bt/controller/esp32/bt.c

@@ -100,7 +100,7 @@ do{\
 
 /* SPIRAM Configuration */
 #if CONFIG_SPIRAM_USE_MALLOC
-#define BTDM_MAX_QUEUE_NUM       (5)
+#define BTDM_MAX_QUEUE_NUM       (6)
 #endif
 
 /* Types definition

components/bt/esp_ble_mesh/Kconfig.in

@@ -9,10 +9,10 @@ if BLE_MESH
     config BLE_MESH_USE_DUPLICATE_SCAN
         bool "Support Duplicate Scan in BLE Mesh"
         depends on BT_BLUEDROID_ENABLED
-        select BTDM_BLE_SCAN_DUPL if BT_CTRL_ESP32
-        select BTDM_BLE_MESH_SCAN_DUPL_EN if BT_CTRL_ESP32
-        select BT_CTRL_BLE_SCAN_DUPL if BT_CTRL_ESP32C3
-        select BT_CTRL_BLE_MESH_SCAN_DUPL_EN if BT_CTRL_ESP32C3
+        select BTDM_BLE_SCAN_DUPL if IDF_TARGET_ESP32
+        select BTDM_BLE_MESH_SCAN_DUPL_EN if IDF_TARGET_ESP32
+        select BT_CTRL_BLE_SCAN_DUPL if IDF_TARGET_ESP32C3
+        select BT_CTRL_BLE_MESH_SCAN_DUPL_EN if IDF_TARGET_ESP32C3
         default y
         help
             Enable this option to allow using specific duplicate scan filter

components/bt/host/bluedroid/Kconfig.in

@@ -42,7 +42,7 @@ config BT_BLUEDROID_MEM_DEBUG
 
 config BT_CLASSIC_ENABLED
     bool "Classic Bluetooth"
-    depends on BT_BLUEDROID_ENABLED && BT_CTRL_ESP32
+    depends on BT_BLUEDROID_ENABLED && IDF_TARGET_ESP32
     default n
     help
         For now this option needs "SMP_ENABLE" to be set to yes
@@ -1070,8 +1070,3 @@ config BT_BLE_42_FEATURES_SUPPORTED
     default n
     help
         This enables BLE 4.2 features.
-
-config BT_RESERVE_DRAM
-    hex
-    default 0xdb5c if BT_ENABLED
-    default 0

components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h

@@ -162,7 +162,7 @@
 #define UC_BT_SMP_SLAVE_CON_PARAMS_UPD_ENABLE  FALSE
 #endif
 
-#if CONFIG_BT_CTRL_ESP32
+#if CONFIG_IDF_TARGET_ESP32
 //BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP
 #ifdef CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP
 #define UC_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP  CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP
@@ -184,9 +184,9 @@
 #define UC_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD     20
 #endif
 
-#endif //CONFIG_BT_CTRL_ESP32
+#endif //CONFIG_IDF_TARGET_ESP32
 
-#if (CONFIG_BT_CTRL_ESP32C3 || CONFIG_BT_CTRL_ESP32S3)
+#if (CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3)
 //BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP
 #ifdef CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP
 #define UC_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP  CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP
@@ -208,7 +208,7 @@
 #define UC_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD     20
 #endif
 
-#endif //(CONFIG_BT_CTRL_ESP32C3 || CONFIG_BT_CTRL_ESP32S3)
+#endif //(CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3)
 
 //BT ACL CONNECTIONS
 #ifdef CONFIG_BT_ACL_CONNECTIONS

components/esp32/Kconfig

@@ -847,7 +847,7 @@ menu "ESP32-specific"
         depends on ESP32_USE_FIXED_STATIC_RAM_SIZE
         help
             RAM size dedicated for static variables (.data & .bss sections).
-            Please note that the actual length will be reduced by BT_RESERVE_DRAM if Bluetooth
+            Please note that the actual length will be reduced by BTDM_RESERVE_DRAM if Bluetooth
             controller is enabled.
 
     config ESP32_DPORT_DIS_INTERRUPT_LVL

components/esp_system/ld/esp32/memory.ld.in

@@ -23,8 +23,8 @@
 #include "ld.common"
 
 /* If BT is not built at all */
-#ifndef CONFIG_BT_RESERVE_DRAM
-#define CONFIG_BT_RESERVE_DRAM 0
+#ifndef CONFIG_BTDM_RESERVE_DRAM
+#define CONFIG_BTDM_RESERVE_DRAM 0
 #endif
 
 #ifdef CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC
@@ -79,8 +79,8 @@ MEMORY
      in heap at runtime. However due to static ROM memory usage at this 176KB mark, the
      additional static memory temporarily cannot be used.
   */
-  dram0_0_seg (RW) :                 org = 0x3FFB0000 + CONFIG_BT_RESERVE_DRAM,
-                                     len = DRAM0_0_SEG_LEN - CONFIG_BT_RESERVE_DRAM
+  dram0_0_seg (RW) :                 org = 0x3FFB0000 + CONFIG_BTDM_RESERVE_DRAM,
+                                     len = DRAM0_0_SEG_LEN - CONFIG_BTDM_RESERVE_DRAM
 
 #ifdef CONFIG_APP_BUILD_USE_FLASH_SECTIONS
   /* Flash mapped constant data */

components/mdns/test_afl_fuzz_host/sdkconfig.h

@@ -53,7 +53,7 @@
 #define CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF 0
 #define CONFIG_BTDM_CTRL_PINNED_TO_CORE 0
 #define CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF 1
-#define CONFIG_BT_RESERVE_DRAM 0x0
+#define CONFIG_BTDM_RESERVE_DRAM 0x0
 #define CONFIG_COAP_MBEDTLS_PSK 1
 #define CONFIG_COAP_LOG_DEFAULT_LEVEL 0
 #define CONFIG_ADC_DISABLE_DAC 1

examples/bluetooth/bluedroid/ble/ble_ancs/sdkconfig.defaults.esp32

@@ -410,10 +410,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -454,7 +453,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -669,7 +668,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_SMP_ENABLE=y
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_ancs/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_ancs/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_compatibility_test/sdkconfig.defaults.esp32

@@ -410,10 +410,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -454,7 +453,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -673,7 +672,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_SMP_ENABLE=y
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_compatibility_test/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_compatibility_test/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_eddystone/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_eddystone/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_hid_device_demo/sdkconfig.defaults.esp32

@@ -410,10 +410,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -454,7 +453,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -674,7 +673,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_SMP_ENABLE=y
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_hid_device_demo/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_hid_device_demo/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_ibeacon/sdkconfig.defaults.esp32

@@ -410,10 +410,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -454,7 +453,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -671,7 +670,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 # CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_ibeacon/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_ibeacon/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_spp_client/sdkconfig.defaults.esp32

@@ -416,10 +416,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -460,7 +459,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -673,7 +672,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 # CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_spp_client/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_spp_client/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_spp_server/sdkconfig.defaults.esp32

@@ -410,10 +410,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -454,7 +453,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -671,7 +670,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 # CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_spp_server/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_spp_server/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/sdkconfig.defaults.esp32

@@ -416,10 +416,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -460,7 +459,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -673,7 +672,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 # CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/sdkconfig.defaults.esp32

@@ -410,10 +410,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -454,7 +453,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -671,7 +670,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 # CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.defaults.esp32

@@ -416,10 +416,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -460,7 +459,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -673,7 +672,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 # CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.defaults.esp32

@@ -410,10 +410,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -454,7 +453,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -669,7 +668,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_SMP_ENABLE=y
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_security_server/sdkconfig.defaults.esp32

@@ -410,10 +410,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -454,7 +453,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -673,7 +672,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_SMP_ENABLE=y
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_security_server/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_security_server/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_server/sdkconfig.defaults.esp32

@@ -410,10 +410,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -454,7 +453,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -671,7 +670,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 # CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_server/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_server/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_server_service_table/sdkconfig.defaults.esp32

@@ -410,10 +410,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -454,7 +453,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -671,7 +670,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 # CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_server_service_table/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gatt_server_service_table/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gattc_multi_connect/sdkconfig.defaults.esp32

@@ -416,10 +416,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -460,7 +459,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -673,7 +672,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 # CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gattc_multi_connect/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble/gattc_multi_connect/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.defaults

@@ -348,7 +348,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -372,7 +371,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_EFF=1
 CONFIG_BTDM_CTRL_BLE_MAX_ACT=10
@@ -412,7 +411,7 @@ CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BTDM_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BTDM_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BTDM_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -615,7 +614,7 @@ CONFIG_BT_SMP_ENABLE=y
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
 # CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.defaults.esp32s3

@@ -472,7 +472,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -545,14 +544,14 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 
 #
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -760,7 +759,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
 # CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/ble50_security_server/sdkconfig.defaults

@@ -348,7 +348,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -372,7 +371,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_EFF=1
 CONFIG_BTDM_CTRL_BLE_MAX_ACT=10
@@ -412,7 +411,7 @@ CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BTDM_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BTDM_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BTDM_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -619,7 +618,6 @@ CONFIG_BT_SMP_ENABLE=y
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/ble50_security_server/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
 # CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/ble50_security_server/sdkconfig.defaults.esp32s3

@@ -472,7 +472,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -545,14 +544,14 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 
 #
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -760,7 +759,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
 # CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/multi-adv/sdkconfig.defaults

@@ -348,7 +348,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -366,7 +365,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_EFF=1
 CONFIG_BTDM_CTRL_BLE_MAX_ACT=10
@@ -406,7 +405,7 @@ CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BTDM_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BTDM_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BTDM_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -606,7 +605,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/multi-adv/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
 # CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/multi-adv/sdkconfig.defaults.esp32s3

@@ -472,7 +472,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -545,14 +544,14 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 
 #
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -760,7 +759,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
 # CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/peroidic_adv/sdkconfig.defaults

@@ -348,7 +348,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -366,7 +365,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_EFF=1
 CONFIG_BTDM_CTRL_BLE_MAX_ACT=10
@@ -406,7 +405,7 @@ CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BTDM_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BTDM_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BTDM_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -606,7 +605,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/peroidic_adv/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
 # CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/peroidic_adv/sdkconfig.defaults.esp32s3

@@ -472,7 +472,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -545,14 +544,14 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 
 #
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -760,7 +759,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
 # CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/peroidic_sync/sdkconfig.defaults

@@ -348,7 +348,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -366,7 +365,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_EFF=1
 CONFIG_BTDM_CTRL_BLE_MAX_ACT=10
@@ -406,7 +405,7 @@ CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BTDM_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BTDM_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BTDM_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -606,7 +605,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/peroidic_sync/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
 # CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/ble_50/peroidic_sync/sdkconfig.defaults.esp32s3

@@ -472,7 +472,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -545,14 +544,14 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 
 #
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -760,7 +759,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
 # CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/coex/gattc_gatts_coex/sdkconfig.defaults.esp32c3

@@ -367,7 +367,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -382,7 +381,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -426,7 +425,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -639,7 +638,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/coex/gattc_gatts_coex/sdkconfig.defaults.esp32s3

@@ -477,7 +477,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -550,7 +549,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -559,7 +558,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -769,7 +768,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/bluedroid/coex/gattc_gatts_coex/sdkconfig.defauts.esp32

@@ -410,10 +410,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -454,7 +453,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -674,7 +673,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_SMP_ENABLE=y
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/blufi/sdkconfig.defaults.esp32

@@ -398,10 +398,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -442,7 +441,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# end of Bluetooth controller
 
 CONFIG_BTDM_CTRL_HW_CCA_EFF=0
 CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=0
@@ -659,7 +658,7 @@ CONFIG_BT_ACL_CONNECTIONS=4
 # CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
-CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/blufi/sdkconfig.defaults.esp32c3

@@ -355,7 +355,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -370,7 +369,7 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -412,7 +411,7 @@ CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
 CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 #
 # MODEM SLEEP Options
@@ -625,7 +624,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/blufi/sdkconfig.defaults.esp32s3

@@ -465,7 +465,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
@@ -538,7 +537,7 @@ CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 
 #
-# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
@@ -547,7 +546,7 @@ CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
+# end of Bluetooth controller
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -754,7 +753,6 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
 

examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32c3

@@ -13,7 +13,6 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y

examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/sdkconfig.defaults

@@ -46,7 +46,7 @@ CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
 CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=y
 CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
 CONFIG_BT_SMP_ENABLE=y
-CONFIG_BT_RESERVE_DRAM=0x10000
+CONFIG_BTDM_RESERVE_DRAM=0x10000
 
 #
 # ESP32-specific

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32c3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32s3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/sdkconfig.defaults.esp32c3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/sdkconfig.defaults.esp32s3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y

examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32c3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y

examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32s3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y

examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32c3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y

examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32s3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y

examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32c3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512

examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32s3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512

examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32c3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512

examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32s3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512

examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32c3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y

examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32s3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y

examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32c3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512

examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32s3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512

examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32c3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y

examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32s3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y

examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32c3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_CTRL_COEX_PARAMETERS_ENABLE=y

examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32s3

@@ -1,7 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32S3=y
 CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_CTRL_COEX_PARAMETERS_ENABLE=y

examples/bluetooth/hci/controller_hci_uart_esp32c3/sdkconfig.defaults

@@ -4,7 +4,6 @@
 #
 
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BT_CTRL_HCI_MODE_UART_H4=y
 CONFIG_BT_CTRL_HCI_TL=0
 CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP=n

tools/ldgen/samples/sdkconfig

@@ -119,7 +119,7 @@ CONFIG_AWS_IOT_SDK=
 #
 CONFIG_BT_ENABLED=
 CONFIG_BTDM_CTRL_PINNED_TO_CORE=0
-CONFIG_BT_RESERVE_DRAM=0
+CONFIG_BTDM_RESERVE_DRAM=0
 
 #
 # ADC configuration