Merge branch 'bugfix/fix_wifi_ld_c3_eco7' into 'master'

fix(rom): remove related rom funcs in c3 rom eco7 MR See merge request espressif/esp-idf!26651
espressif · Oct 25, 2023 · 9f6bf3b · 9f6bf3b
2 parents d20654e + 7532df4
commit 9f6bf3b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1631,7 +1631,7 @@ ppDequeueTxDone_Locked = 0x40001d18;
 ppProcTxDone = 0x40001d1c;
 /*pm_tx_data_done_process = 0x40001d20;*/
 config_is_cache_tx_buf_enabled = 0x40001d24;
-ppMapWaitTxq = 0x40001d28;
+//ppMapWaitTxq = 0x40001d28;
 ppProcessWaitingQueue = 0x40001d2c;
 ppDisableQueue = 0x40001d30;
 pm_allow_tx = 0x40001d34;
@@ -1729,14 +1729,14 @@ pp_timer_do_process = 0x40001ea0;
 rcUpdateAMPDUParam = 0x40001ea4;
 rcUpdatePhyMode = 0x40001ea8;
 rcGetHighestRateIdx = 0x40001eac;
-pm_tx_null_data_done_process = 0x40001eb0;
-pm_tx_data_process = 0x40001eb4;
+//pm_tx_null_data_done_process = 0x40001eb0;
+//pm_tx_data_process = 0x40001eb4;
 /* pm_attach = 0x40001eb8; */
 /* pm_coex_schm_process = 0x40001ebc; */
 ppInitTxq = 0x40001ec0;
 pp_attach = 0x40001ec4;
 pp_deattach = 0x40001ec8;
-pm_on_probe_resp_rx = 0x40001ecc;
+//pm_on_probe_resp_rx = 0x40001ecc;
 hal_set_sta_tsf = 0x40001ed0;
 ic_update_sta_tsf = 0x40001ed4;
 ic_tx_pkt = 0x40001ed8;
@@ -1915,7 +1915,7 @@ wifi_get_init_state = 0x40002088;
 /* cnx_coexist_timeout = 0x40002090; */
 /* sta_recv_mgmt = 0x40002094;*/
 ieee80211_send_setup = 0x40002098;
-ieee80211_send_probereq = 0x4000209c;
+//ieee80211_send_probereq = 0x4000209c;
 sta_auth_shared = 0x400020a4;
 /* cnx_coexist_timeout_process = 0x400020ac; */
 ieee80211_alloc_challenge = 0x400020b0;

diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
@@ -33,6 +33,7 @@ wDev_ProcessFiq = 0x400017f0;
 wDev_ProcessRxSucData = 0x400017f4;
 ppProcTxDone = 0x40001804;
 pm_tx_data_done_process = 0x40001808;
+ppMapWaitTxq = 0x40001810;
 ieee80211_encap_esfbuf = 0x4000185c;
 sta_input = 0x40001870;
 ieee80211_crypto_decap = 0x4000189c;

diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1644,7 +1644,7 @@ wdev_csi_len_align = 0x400017fc;
 ppDequeueTxDone_Locked = 0x40001800;
 /*pm_tx_data_done_process = 0x40001808;*/
 config_is_cache_tx_buf_enabled = 0x4000180c;
-ppMapWaitTxq = 0x40001810;
+//ppMapWaitTxq = 0x40001810;
 ppProcessWaitingQueue = 0x40001814;
 ppDisableQueue = 0x40001818;
 pm_allow_tx = 0x4000181c;

diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
@@ -165,7 +165,7 @@ ppDequeueTxDone_Locked = 0x40000e14;
 //ppProcTxDone = 0x40000e18;
 //pm_tx_data_done_process = 0x40000e1c;
 config_is_cache_tx_buf_enabled = 0x40000e20;
-ppMapWaitTxq = 0x40000e24;
+//ppMapWaitTxq = 0x40000e24;
 ppProcessWaitingQueue = 0x40000e28;
 ppDisableQueue = 0x40000e2c;
 pm_allow_tx = 0x40000e30;

diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1950,7 +1950,7 @@ ppDequeueTxDone_Locked = 0x40005940;
 /*ppProcTxDone = 0x4000594c;*/
 /*pm_tx_data_done_process = 0x40005958;*/
 config_is_cache_tx_buf_enabled = 0x40005964;
-ppMapWaitTxq = 0x40005970;
+//ppMapWaitTxq = 0x40005970;
 ppProcessWaitingQueue = 0x4000597c;
 ppDisableQueue = 0x40005988;
 pm_allow_tx = 0x40005994;