From 396c10c6185c21978297ddc1f47bb4b7217b5df7 Mon Sep 17 00:00:00 2001 From: Shen Wei Long Date: Thu, 8 May 2025 14:53:53 +0800 Subject: [PATCH 1/4] change(ble): [AUTO_MR] Update lib_esp32h2 to 9ecb81c8 (cherry picked from commit a3cc91dbf0f3c856b8a6dfc2592ea767b1b96769) Co-authored-by: Shen Weilong --- 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 926e5206b4..efd8a69553 160000 --- a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib +++ b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib @@ -1 +1 @@ -Subproject commit 926e5206b4adbbfdb90a94205082ac3344a7beb3 +Subproject commit efd8a6955349938bff782c00d2880195ca99854a From 6494b57fe8305505934540bfcf44ec42b5301587 Mon Sep 17 00:00:00 2001 From: Shen Wei Long Date: Thu, 8 May 2025 14:53:56 +0800 Subject: [PATCH 2/4] change(ble): [AUTO_MR] Update lib_esp32c6 to 9ecb81c8 (cherry picked from commit a477bfb140b309a5ed3c2b3426d54dfd1de6e57d) Co-authored-by: Shen Weilong --- 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 9d2051f4cb..233738dc87 160000 --- a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib +++ b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib @@ -1 +1 @@ -Subproject commit 9d2051f4cb5a4936149012188c3f021287e492f4 +Subproject commit 233738dc87a81c1ea3156422f8428721f4c2e41b From 4103766c1ecf9a9251a0076d095fb8869e250910 Mon Sep 17 00:00:00 2001 From: Shen Wei Long Date: Thu, 8 May 2025 14:53:58 +0800 Subject: [PATCH 3/4] change(ble): [AUTO_MR] Update lib_esp32c2 to 16e16586 (cherry picked from commit 26754d8e719b8832474930e25170b6dc578010db) Co-authored-by: Shen Weilong --- 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 a69fafcc0a..d6c94459f3 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit a69fafcc0a002a63f757bd4741a5d844d5e8dbf2 +Subproject commit d6c94459f3851953252123f684a6be63a074a5f7 From 8f2c00f18ac874420c8145e14ec5836430b83582 Mon Sep 17 00:00:00 2001 From: Shen Wei Long Date: Thu, 8 May 2025 14:54:01 +0800 Subject: [PATCH 4/4] fix(ble): update ld file on ESP32-C2 (cherry picked from commit ee6607b489ce183cb9e96dce70d8a0efeda13623) Co-authored-by: zwl --- components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld | 8 ++++---- components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld | 6 +++--- 2 files changed, 7 insertions(+), 7 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 5584020dca..5ca9466542 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld @@ -67,7 +67,7 @@ r_ble_hci_uart_trans_reset = 0x40000b54; r_ble_hci_uart_tx_char = 0x40000b58; r_ble_hci_uart_tx_pkt_type = 0x40000b5c; r_ble_hw_driver_deinit = 0x40000b60; -r_ble_hw_driver_env_init = 0x40000b64; +//r_ble_hw_driver_env_init = 0x40000b64; r_ble_hw_encrypt_block = 0x40000b68; r_ble_hw_get_public_addr = 0x40000b6c; r_ble_hw_get_static_addr = 0x40000b70; @@ -84,7 +84,7 @@ r_ble_hw_rx_local_is_resolved = 0x40000b98; r_ble_hw_rx_local_is_rpa = 0x40000b9c; r_ble_hw_whitelist_add = 0x40000ba0; r_ble_hw_whitelist_clear = 0x40000ba4; -r_ble_hw_whitelist_dev_num = 0x40000ba8; +//r_ble_hw_whitelist_dev_num = 0x40000ba8; r_ble_hw_whitelist_get_base = 0x40000bac; r_ble_hw_whitelist_rmv = 0x40000bb0; r_ble_hw_whitelist_search = 0x40000bb4; @@ -157,7 +157,7 @@ r_ble_ll_adv_set_random_addr = 0x40000cb8; r_ble_ll_adv_set_sched = 0x40000cc0; r_ble_ll_adv_sm_deinit = 0x40000cc4; r_ble_ll_adv_sm_event_init = 0x40000cc8; -r_ble_ll_adv_sm_find_configured = 0x40000ccc; +//r_ble_ll_adv_sm_find_configured = 0x40000ccc; r_ble_ll_adv_sm_get = 0x40000cd0; r_ble_ll_adv_sm_init = 0x40000cd4; r_ble_ll_adv_sm_reset = 0x40000cd8; @@ -225,7 +225,7 @@ r_ble_ll_conn_hci_rd_rem_ver_cmd = 0x40000dcc; r_ble_ll_conn_hci_rd_rssi = 0x40000dd0; r_ble_ll_conn_hci_read_rem_features = 0x40000dd4; r_ble_ll_conn_hci_set_chan_class = 0x40000dd8; -r_ble_ll_conn_hci_set_data_len = 0x40000ddc; +//r_ble_ll_conn_hci_set_data_len = 0x40000ddc; r_ble_ll_conn_hci_update = 0x40000de0; r_ble_ll_conn_hci_wr_auth_pyld_tmo = 0x40000de4; r_ble_ll_conn_init_phy = 0x40000de8; diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld index 22c81d7309..b940fe9d11 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld @@ -69,7 +69,7 @@ r_ble_hw_rng_stop = 0x40000b94; r_ble_hw_rx_local_is_resolved = 0x40000b98; r_ble_hw_rx_local_is_rpa = 0x40000b9c; r_ble_hw_whitelist_add = 0x40000ba0; -r_ble_hw_whitelist_dev_num = 0x40000ba8; +//r_ble_hw_whitelist_dev_num = 0x40000ba8; r_ble_hw_whitelist_get_base = 0x40000bac; r_ble_hw_whitelist_search = 0x40000bb4; r_ble_hw_whitelist_sort = 0x40000bb8; @@ -125,7 +125,7 @@ r_ble_ll_adv_scheduled = 0x40000ca4; r_ble_ll_adv_set_random_addr = 0x40000cb8; r_ble_ll_adv_sm_deinit = 0x40000cc4; r_ble_ll_adv_sm_event_init = 0x40000cc8; -r_ble_ll_adv_sm_find_configured = 0x40000ccc; +//r_ble_ll_adv_sm_find_configured = 0x40000ccc; r_ble_ll_adv_sm_get = 0x40000cd0; r_ble_ll_adv_sm_reset = 0x40000cd8; r_ble_ll_adv_sm_start = 0x40000cdc; @@ -181,7 +181,7 @@ r_ble_ll_conn_hci_rd_chan_map = 0x40000dc8; r_ble_ll_conn_hci_rd_rem_ver_cmd = 0x40000dcc; r_ble_ll_conn_hci_rd_rssi = 0x40000dd0; r_ble_ll_conn_hci_read_rem_features = 0x40000dd4; -r_ble_ll_conn_hci_set_data_len = 0x40000ddc; +//r_ble_ll_conn_hci_set_data_len = 0x40000ddc; r_ble_ll_conn_hci_update = 0x40000de0; r_ble_ll_conn_hci_wr_auth_pyld_tmo = 0x40000de4; r_ble_ll_conn_init_phy = 0x40000de8;