Merge branch 'bugfix/fix_coex_ld_issue_v5.2' into 'release/v5.2'

fix(wifi): fix coex ld issue (v5.2) See merge request espressif/esp-idf!29915
tasmota · Apr 2, 2024 · 2152112 · 2152112
2 parents 8599ec3 + cc13237
commit 2152112
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1975,12 +1975,12 @@ esp_coex_rom_version_get = 0x40002168;
 coex_bt_release = 0x4000216c;
 coex_bt_request = 0x40002170;
 coex_core_ble_conn_dyn_prio_get = 0x40002174;
-coex_core_event_duration_get = 0x40002178;
+/*coex_core_event_duration_get = 0x40002178;*/
 coex_core_pti_get = 0x4000217c;
 coex_core_release = 0x40002180;
 coex_core_request = 0x40002184;
 coex_core_status_get = 0x40002188;
-coex_core_timer_idx_get = 0x4000218c;
+/*coex_core_timer_idx_get = 0x4000218c;*/
 coex_event_duration_get = 0x40002190;
 coex_hw_timer_disable = 0x40002194;
 coex_hw_timer_enable = 0x40002198;

diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
@@ -39,7 +39,7 @@ ppMapWaitTxq = 0x40001810;
 /*sta_input = 0x40001870;*/
 ieee80211_crypto_decap = 0x4000189c;
 ieee80211_decap = 0x400018a0;
-coex_core_timer_idx_get = 0x400018d0;
+/*coex_core_timer_idx_get = 0x400018d0;*/
 rom1_chip_i2c_readReg = 0x40001924;
 rom1_chip_i2c_writeReg = 0x40001928;
 rom_index_to_txbbgain = 0x40001964;

diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1760,7 +1760,7 @@ esp_coex_rom_version_get = 0x400018ac;
 coex_bt_release = 0x400018b0;
 coex_bt_request = 0x400018b4;
 coex_core_ble_conn_dyn_prio_get = 0x400018b8;
-coex_core_event_duration_get = 0x400018bc;
+/*coex_core_event_duration_get = 0x400018bc;*/
 coex_core_pti_get = 0x400018c0;
 coex_core_release = 0x400018c4;
 coex_core_request = 0x400018c8;

diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.coexist.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.coexist.ld
@@ -22,12 +22,12 @@ esp_coex_rom_version_get = 0x40000afc;
 coex_bt_release = 0x40000b00;
 coex_bt_request = 0x40000b04;
 coex_core_ble_conn_dyn_prio_get = 0x40000b08;
-coex_core_event_duration_get = 0x40000b0c;
+/*coex_core_event_duration_get = 0x40000b0c;*/
 coex_core_pti_get = 0x40000b10;
 coex_core_release = 0x40000b14;
 coex_core_request = 0x40000b18;
 coex_core_status_get = 0x40000b1c;
-coex_core_timer_idx_get = 0x40000b20;
+/*coex_core_timer_idx_get = 0x40000b20;*/
 coex_event_duration_get = 0x40000b24;
 coex_hw_timer_disable = 0x40000b28;
 coex_hw_timer_enable = 0x40000b2c;

diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -2069,7 +2069,7 @@ esp_coex_rom_version_get = 0x40005b68;
 coex_bt_release = 0x40005b74;
 coex_bt_request = 0x40005b80;
 coex_core_ble_conn_dyn_prio_get = 0x40005b8c;
-coex_core_event_duration_get = 0x40005b98;
+/*coex_core_event_duration_get = 0x40005b98;*/
 coex_core_pti_get = 0x40005ba4;
 coex_core_release = 0x40005bb0;
 coex_core_request = 0x40005bbc;