From 660ccc089ecfc89f700fad81a340129d3a8f2bd7 Mon Sep 17 00:00:00 2001 From: Zhou Xiao Date: Fri, 19 Sep 2025 11:33:15 +0800 Subject: [PATCH 1/4] change(ble): [AUTO_MR] Update lib_esp32h2 to 390a8efd (cherry picked from commit a7b87fe83230ad881d8362a43f8f6fc7db1b2571) Co-authored-by: Zhou Xiao --- components/bt/controller/lib_esp32h2/esp32h2-bt-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib index 0783414092..a8a87adbd0 160000 --- a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib +++ b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib @@ -1 +1 @@ -Subproject commit 07834140920ccf33cbca4b9c0655256efe389ed7 +Subproject commit a8a87adbd005ffaed05051b9a1b1809bfbdc700d From 8f68334081266b8764f06f6d6422ff660d6451dc Mon Sep 17 00:00:00 2001 From: Zhou Xiao Date: Fri, 19 Sep 2025 11:33:17 +0800 Subject: [PATCH 2/4] change(ble): [AUTO_MR] Update lib_esp32c6 to 390a8efd (cherry picked from commit 26dcd595997195109c39cb36d7c803bfbc02384e) Co-authored-by: Zhou Xiao --- components/bt/controller/lib_esp32c6/esp32c6-bt-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib index 9d2f7a02d1..56d7454a97 160000 --- a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib +++ b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib @@ -1 +1 @@ -Subproject commit 9d2f7a02d1073a2835cf71d9a9231759324f0338 +Subproject commit 56d7454a97d4d5bce43ee611e69d293c269f5d4a From 9426f8c276180b626b33da1745841c901306859b Mon Sep 17 00:00:00 2001 From: Zhou Xiao Date: Fri, 19 Sep 2025 11:33:19 +0800 Subject: [PATCH 3/4] change(ble): [AUTO_MR] Update lib_esp32c2 to 58398575 (cherry picked from commit a56e7df7107c267b9e52ba340b83f64367d9571e) Co-authored-by: Zhou Xiao --- components/bt/controller/lib_esp32c2/esp32c2-bt-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib index c5a5ba3f0a..2045454453 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit c5a5ba3f0ae2bb056384a140ad809ee5d4e78491 +Subproject commit 204545445378b2704e3311911373aac326892597 From dbd6a69bca10a79bd0eff26dcc2fd334a886ef75 Mon Sep 17 00:00:00 2001 From: Zhou Xiao Date: Fri, 19 Sep 2025 11:33:22 +0800 Subject: [PATCH 4/4] change(ble): [AUTO_MR] updated rom linker script for ESP32-C2 (cherry picked from commit 09a3b29d01fad2cda730caab0e73c61d5a727670) Co-authored-by: Zhou Xiao --- components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld | 8 ++++---- components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld index 93df187382..59bd96d5c5 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld @@ -459,7 +459,7 @@ r_ble_ll_resolv_list_clr = 0x4000117c; r_ble_ll_resolv_list_find = 0x40001180; r_ble_ll_resolv_list_read_size = 0x40001184; r_ble_ll_resolv_list_reset = 0x40001188; -r_ble_ll_resolv_list_rmv = 0x4000118c; +//r_ble_ll_resolv_list_rmv = 0x4000118c; r_ble_ll_resolv_local_addr_rd = 0x40001190; r_ble_ll_resolv_peer_addr_rd = 0x40001194; r_ble_ll_resolv_peer_rpa_any = 0x40001198; @@ -503,7 +503,7 @@ r_ble_ll_scan_have_rxd_scan_rsp = 0x4000122c; r_ble_ll_scan_init = 0x40001230; r_ble_ll_scan_initiator_start = 0x40001234; r_ble_ll_scan_is_inside_window = 0x40001238; -r_ble_ll_scan_move_window_to = 0x4000123c; +//r_ble_ll_scan_move_window_to = 0x4000123c; r_ble_ll_scan_npl_reset = 0x40001240; r_ble_ll_scan_parse_auxptr = 0x40001244; r_ble_ll_scan_parse_ext_hdr = 0x40001248; @@ -601,9 +601,9 @@ r_ble_ll_utils_csa2_prng = 0x400013b8; r_ble_ll_utils_remapped_channel = 0x400013bc; r_ble_ll_whitelist_add = 0x400013c0; r_ble_ll_whitelist_chg_allowed = 0x400013c4; -r_ble_ll_whitelist_clear = 0x400013c8; +//r_ble_ll_whitelist_clear = 0x400013c8; r_ble_ll_whitelist_read_size = 0x400013cc; -r_ble_ll_whitelist_rmv = 0x400013d0; +//r_ble_ll_whitelist_rmv = 0x400013d0; r_ble_ll_whitelist_search = 0x400013d4; r_ble_ll_write_rf_path_compensation = 0x400013d8; r_ble_lll_adv_aux_scannable_pdu_payload_len = 0x400013dc; diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld index edde433afe..a0d2795b4d 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld @@ -408,7 +408,7 @@ r_ble_ll_scan_get_peer_rpa = 0x40001228; r_ble_ll_scan_have_rxd_scan_rsp = 0x4000122c; r_ble_ll_scan_initiator_start = 0x40001234; r_ble_ll_scan_is_inside_window = 0x40001238; -r_ble_ll_scan_move_window_to = 0x4000123c; +//r_ble_ll_scan_move_window_to = 0x4000123c; r_ble_ll_scan_npl_reset = 0x40001240; r_ble_ll_scan_parse_auxptr = 0x40001244; r_ble_ll_scan_parse_ext_hdr = 0x40001248;