From d10b60aab3fc2df00afe095edb0f7c41cd5ea38f Mon Sep 17 00:00:00 2001 From: zwl Date: Wed, 17 Apr 2024 15:04:39 +0800 Subject: [PATCH 1/2] ble: fixed the bt cmakelist error when use nimble host only --- components/bt/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt index df0da6a316..ac8962d148 100644 --- a/components/bt/CMakeLists.txt +++ b/components/bt/CMakeLists.txt @@ -705,14 +705,14 @@ if(CONFIG_BT_ENABLED) target_link_libraries(${COMPONENT_LIB} INTERFACE "-L${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32c3_family/esp32s3") target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app) - elseif(CONFIG_IDF_TARGET_ESP32H2) + elseif(CONFIG_IDF_TARGET_ESP32H2 AND CONFIG_BT_CONTROLLER_ENABLED) if(CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_1) add_prebuilt_library(nimblelib "controller/lib_esp32h2/esp32h2-bt-lib/beta1/libble_app.a") elseif(CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_2) add_prebuilt_library(nimblelib "controller/lib_esp32h2/esp32h2-bt-lib/beta2/libble_app.a") endif() target_link_libraries(${COMPONENT_LIB} PRIVATE nimblelib) - elseif(CONFIG_IDF_TARGET_ESP32C2) + elseif(CONFIG_IDF_TARGET_ESP32C2 AND CONFIG_BT_CONTROLLER_ENABLED) add_prebuilt_library(nimblelib "controller/lib_esp32c2/esp32c2-bt-lib/libble_app.a") target_link_libraries(${COMPONENT_LIB} PRIVATE nimblelib) endif() From c6d8d19b81f24b6534635d822c02cda0d4c32d31 Mon Sep 17 00:00:00 2001 From: zwl Date: Wed, 17 Apr 2024 14:46:02 +0800 Subject: [PATCH 2/2] ble: fixed an occasional assertion issue in coexistence scenarios on ESP32C2 --- components/bt/controller/lib_esp32c2/esp32c2-bt-lib | 2 +- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib index 05fa7ad7ed..ea4595a563 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit 05fa7ad7edc0fda255e353880bbd38263bc08b9b +Subproject commit ea4595a5630326d428ee3457df654e1840b5e101 diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index fa68c567bd..aa5bbc79d6 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -1093,7 +1093,6 @@ r_ble_lll_conn_coex_dpc_update_on_event_scheduled = 0x400014e4; r_ble_lll_conn_coex_dpc_update_on_event_started = 0x400014e8; r_ble_lll_conn_cth_flow_alloc_credit = 0x400014ec; r_ble_lll_conn_current_sm_over = 0x400014f4; -r_ble_lll_conn_event_end_timer_cb = 0x40001508; r_ble_lll_conn_event_is_over = 0x40001510; r_ble_lll_conn_event_start_cb = 0x40001514; r_ble_lll_conn_free_rx_mbuf = 0x40001518;