components/bt: Fix link error of Kconfig

2025-10-29 20:34:36 +00:00 · 2021-09-13 15:42:49 +08:00
parent 0997c6df99
commit 6f86e1bb63
91 changed files with 12 additions and 117 deletions
--- a/components/bt/Kconfig
+++ b/components/bt/Kconfig
@@ -7,20 +7,6 @@ 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)
@@ -28,19 +14,19 @@ menu "Bluetooth"
        default n

    menu "Bluetooth controller(ESP32 Dual Mode Bluetooth)"
-        visible if BT_CTRL_ESP32
+        depends on BT_ENABLED && IDF_TARGET_ESP32

        source "$IDF_PATH/components/bt/controller/esp32/Kconfig.in"
    endmenu

    menu "Bluetooth controller(ESP32C3 Bluetooth Low Energy)"
-        visible if BT_CTRL_ESP32C3
+        depends on BT_ENABLED && IDF_TARGET_ESP32C3

        source "$IDF_PATH/components/bt/controller/esp32c3/Kconfig.in"
    endmenu

    menu "Bluetooth controller(ESP32S3 Bluetooth Low Energy)"
-        visible if BT_CTRL_ESP32S3
+        depends on BT_ENABLED && IDF_TARGET_ESP32S3

        source "$IDF_PATH/components/bt/controller/esp32s3/Kconfig.in"
    endmenu
--- a/components/bt/controller/esp32/Kconfig.in
+++ b/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.
--- a/components/bt/esp_ble_mesh/Kconfig.in
+++ b/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
--- a/components/bt/host/bluedroid/Kconfig.in
+++ b/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
--- a/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h
+++ b/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h
@@ -178,9 +178,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
@@ -202,7 +202,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
--- a/examples/bluetooth/bluedroid/ble/ble_ancs/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/bluedroid/ble/ble_ancs/sdkconfig.defaults.esp32
@@ -410,7 +410,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/bluedroid/ble/ble_ancs/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/ble_ancs/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/ble_ancs/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble/ble_compatibility_test/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/bluedroid/ble/ble_compatibility_test/sdkconfig.defaults.esp32
@@ -410,7 +410,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/bluedroid/ble/ble_compatibility_test/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/ble_compatibility_test/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/ble_compatibility_test/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble/ble_eddystone/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/ble_eddystone/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/ble_eddystone/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/sdkconfig.defaults.esp32
@@ -410,7 +410,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble/ble_ibeacon/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/bluedroid/ble/ble_ibeacon/sdkconfig.defaults.esp32
@@ -410,7 +410,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/bluedroid/ble/ble_ibeacon/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/ble_ibeacon/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/ble_ibeacon/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble/ble_spp_client/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/bluedroid/ble/ble_spp_client/sdkconfig.defaults.esp32
@@ -416,7 +416,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/bluedroid/ble/ble_spp_client/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/ble_spp_client/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/ble_spp_client/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble/ble_spp_server/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/bluedroid/ble/ble_spp_server/sdkconfig.defaults.esp32
@@ -410,7 +410,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/bluedroid/ble/ble_spp_server/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/ble_spp_server/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/ble_spp_server/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/sdkconfig.defaults.esp32
@@ -416,7 +416,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/sdkconfig.defaults.esp32
@@ -410,7 +410,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.defaults.esp32
@@ -416,7 +416,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.defaults.esp32
@@ -410,7 +410,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble/gatt_security_server/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/bluedroid/ble/gatt_security_server/sdkconfig.defaults.esp32
@@ -410,7 +410,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/bluedroid/ble/gatt_security_server/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/gatt_security_server/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/gatt_security_server/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble/gatt_server/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/bluedroid/ble/gatt_server/sdkconfig.defaults.esp32
@@ -410,7 +410,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/bluedroid/ble/gatt_server/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/gatt_server/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/gatt_server/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/bluedroid/ble/gatt_server_service_table/sdkconfig.defaults.esp32
@@ -410,7 +410,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/gatt_server_service_table/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble/gattc_multi_connect/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/bluedroid/ble/gattc_multi_connect/sdkconfig.defaults.esp32
@@ -416,7 +416,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/bluedroid/ble/gattc_multi_connect/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble/gattc_multi_connect/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble/gattc_multi_connect/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.defaults
+++ b/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
--- a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble_50/ble50_security_client/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
--- a/examples/bluetooth/bluedroid/ble_50/ble50_security_server/sdkconfig.defaults
+++ b/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
--- a/examples/bluetooth/bluedroid/ble_50/ble50_security_server/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble_50/ble50_security_server/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble_50/ble50_security_server/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
--- a/examples/bluetooth/bluedroid/ble_50/multi-adv/sdkconfig.defaults
+++ b/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
--- a/examples/bluetooth/bluedroid/ble_50/multi-adv/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble_50/multi-adv/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble_50/multi-adv/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
--- a/examples/bluetooth/bluedroid/ble_50/peroidic_adv/sdkconfig.defaults
+++ b/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
--- a/examples/bluetooth/bluedroid/ble_50/peroidic_adv/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble_50/peroidic_adv/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble_50/peroidic_adv/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
--- a/examples/bluetooth/bluedroid/ble_50/peroidic_sync/sdkconfig.defaults
+++ b/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
--- a/examples/bluetooth/bluedroid/ble_50/peroidic_sync/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/ble_50/peroidic_sync/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/ble_50/peroidic_sync/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
--- a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/sdkconfig.defauts.esp32
+++ b/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/sdkconfig.defauts.esp32
@@ -410,7 +410,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/blufi/sdkconfig.defaults.esp32
+++ b/examples/bluetooth/blufi/sdkconfig.defaults.esp32
@@ -410,7 +410,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y

 #
 # Bluetooth controller(ESP32 Dual Mode Bluetooth)
--- a/examples/bluetooth/blufi/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/blufi/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
--- a/examples/bluetooth/blufi/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/blufi/sdkconfig.defaults.esp32s3
@@ -470,7 +470,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
--- a/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32s3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/sdkconfig.defaults.esp32s3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32s3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32s3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32s3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32s3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32s3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32s3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32s3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32c3
+++ b/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
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32s3
+++ b/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