diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32
index 1c6d248b62..edbb3cb0c0 160000
--- a/components/bt/controller/lib_esp32
+++ b/components/bt/controller/lib_esp32
@@ -1 +1 @@
-Subproject commit 1c6d248b6296473a353047700922534b09d9203f
+Subproject commit edbb3cb0c000716fc8ff71a7a2e2d7e21b4fc881
diff --git a/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h b/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h
index d95b2de98a..d652ead5fb 100644
--- a/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h
+++ b/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h
@@ -148,8 +148,6 @@
 #define UC_BT_SMP_SLAVE_CON_PARAMS_UPD_ENABLE  FALSE
 #endif
 
-#if CONFIG_BT_CTRL_ESP32
-
 //Device Nane Maximum Length
 #ifdef CONFIG_BT_MAX_DEVICE_NAME_LEN
 #define UC_MAX_LOC_BD_NAME_LEN  CONFIG_BT_MAX_DEVICE_NAME_LEN
@@ -157,6 +155,8 @@
 #define UC_MAX_LOC_BD_NAME_LEN 64
 #endif
 
+#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