From adb20fb2f38781811704687ab6b10f0f26cdf66c Mon Sep 17 00:00:00 2001
From: wangmengyang <wangmengyang@espressif.com>
Date: Tue, 25 May 2021 11:51:28 +0800
Subject: [PATCH 1/3] components/bt: fix PATH of libbtdm_app.a in build script

---
 components/bt/CMakeLists.txt | 2 +-
 components/bt/component.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt
index 3fe4dcfe06..f14045ada8 100644
--- a/components/bt/CMakeLists.txt
+++ b/components/bt/CMakeLists.txt
@@ -573,6 +573,6 @@ idf_component_register(SRCS "${srcs}"
 if(CONFIG_BT_ENABLED)
     target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-implicit-fallthrough -Wno-unused-const-variable)
 
-    target_link_libraries(${COMPONENT_LIB} INTERFACE "-L${CMAKE_CURRENT_LIST_DIR}/controller/lib")
+    target_link_libraries(${COMPONENT_LIB} INTERFACE "-L${CMAKE_CURRENT_LIST_DIR}/controller/lib/esp32")
     target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app)
 endif()
diff --git a/components/bt/component.mk b/components/bt/component.mk
index 187fc6dfe2..890015ea9c 100644
--- a/components/bt/component.mk
+++ b/components/bt/component.mk
@@ -9,11 +9,11 @@ COMPONENT_ADD_INCLUDEDIRS := include
 
 LIBS := btdm_app
 
-COMPONENT_ADD_LDFLAGS     := -lbt -L $(COMPONENT_PATH)/controller/lib \
+COMPONENT_ADD_LDFLAGS     := -lbt -L $(COMPONENT_PATH)/controller/lib/esp32 \
                            $(addprefix -l,$(LIBS))
 
 # re-link program if BT binary libs change
-COMPONENT_ADD_LINKER_DEPS := $(patsubst %,$(COMPONENT_PATH)/controller/lib/lib%.a,$(LIBS))
+COMPONENT_ADD_LINKER_DEPS := $(patsubst %,$(COMPONENT_PATH)/controller/lib/esp32/lib%.a,$(LIBS))
 
 COMPONENT_SUBMODULES += controller/lib
 

From 4d95ffcca29a692726e5e0f981f8ad7caad11995 Mon Sep 17 00:00:00 2001
From: Chinmay Chhajed <chinmay.chhajed@espressif.com>
Date: Mon, 17 May 2021 13:11:38 +0530
Subject: [PATCH 2/3] bt controller: Fixed handling for invalid feature page.

---
 components/bt/controller/lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/bt/controller/lib b/components/bt/controller/lib
index c2e961d07c..871af73666 160000
--- a/components/bt/controller/lib
+++ b/components/bt/controller/lib
@@ -1 +1 @@
-Subproject commit c2e961d07cba8e5a08749e1f1d5c6ffe76d4b115
+Subproject commit 871af736668852485d4624bc014aed0246fada4f

From 7988705558811f42a14e9f47e98901a23d3f1943 Mon Sep 17 00:00:00 2001
From: baohongde <baohongde@espressif.com>
Date: Tue, 25 May 2021 15:10:49 +0800
Subject: [PATCH 3/3] components/bt: Delete BLE ADV priority high

---
 components/bt/Kconfig         | 15 ---------------
 components/bt/controller/bt.c |  7 -------
 components/bt/controller/lib  |  2 +-
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/components/bt/Kconfig b/components/bt/Kconfig
index b8a52aa1ac..1c04a89e4a 100644
--- a/components/bt/Kconfig
+++ b/components/bt/Kconfig
@@ -428,21 +428,6 @@ menu "Bluetooth"
                 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.
 
-        menuconfig BTDM_COEX_BT_OPTIONS
-            bool "Coexistence Bluetooth Side Options"
-            depends on ESP32_WIFI_SW_COEXIST_ENABLE
-            default n
-            help
-                Options of Bluetooth Side of WiFi and bluetooth coexistence.
-
-        config BTDM_COEX_BLE_ADV_HIGH_PRIORITY
-            bool "Improve BLE ADV priority for WiFi & BLE coexistence"
-            depends on BTDM_COEX_BT_OPTIONS
-            default n
-            help
-                Improve BLE ADV coexistence priority to make it better performance.
-                For example, BLE mesh need to enable this option to improve BLE adv performance.
-
     endmenu
 
     choice BT_HOST
diff --git a/components/bt/controller/bt.c b/components/bt/controller/bt.c
index 8fc959f5d3..384d4d1079 100644
--- a/components/bt/controller/bt.c
+++ b/components/bt/controller/bt.c
@@ -238,7 +238,6 @@ extern uint8_t coex_schm_curr_period_get(void);
 extern void * coex_schm_curr_phase_get(void);
 extern int coex_wifi_channel_get(uint8_t *primary, uint8_t *secondary);
 extern int coex_register_wifi_channel_change_callback(void *cb);
-extern void coex_ble_adv_priority_high_set(bool high);
 
 extern char _bss_start_btdm;
 extern char _bss_end_btdm;
@@ -1461,12 +1460,6 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
         goto error;
     }
 
-    #ifdef CONFIG_BTDM_COEX_BLE_ADV_HIGH_PRIORITY
-        coex_ble_adv_priority_high_set(true);
-    #else
-        coex_ble_adv_priority_high_set(false);
-    #endif
-
     btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;
 
     return ESP_OK;
diff --git a/components/bt/controller/lib b/components/bt/controller/lib
index 871af73666..1f7e45e2f6 160000
--- a/components/bt/controller/lib
+++ b/components/bt/controller/lib
@@ -1 +1 @@
-Subproject commit 871af736668852485d4624bc014aed0246fada4f
+Subproject commit 1f7e45e2f645f115fc4ca7fc35ecee2d894ff2ea