alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/esp32c6_update_ld' into 'master'

Browse Source 
fix(wifi):esp32c6 update ld

Closes WIFIBUG-539, WIFIBUG-556, and WIFIBUG-601

See merge request espressif/esp-idf!30918
This commit is contained in:
Jiang Jiang Jian 2024-06-13 18:04:23 +08:00
commit aab63bed24
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld
View File

@ -37,7 +37,7 @@ ieee80211_ampdu_start_age_timer = 0x40000b84;
ieee80211_is_tx_allowed = 0x40000b8c; ieee80211_is_tx_allowed = 0x40000b8c;
ieee80211_output_pending_eb = 0x40000b90; ieee80211_output_pending_eb = 0x40000b90;
/*ieee80211_output_process = 0x40000b94;*/ /*ieee80211_output_process = 0x40000b94;*/
ieee80211_set_tx_desc = 0x40000b98; //ieee80211_set_tx_desc = 0x40000b98;
//sta_input = 0x40000b9c; //sta_input = 0x40000b9c;
wifi_get_macaddr = 0x40000ba0; wifi_get_macaddr = 0x40000ba0;
wifi_rf_phy_disable = 0x40000ba4; wifi_rf_phy_disable = 0x40000ba4;
@ -52,7 +52,7 @@ ieee80211_crypto_encap = 0x40000bc0;
ieee80211_decap = 0x40000bc8; ieee80211_decap = 0x40000bc8;
wifi_is_started = 0x40000bcc; wifi_is_started = 0x40000bcc;
ieee80211_gettid = 0x40000bd0; ieee80211_gettid = 0x40000bd0;
ieee80211_encap_esfbuf_htc = 0x40000bd4; //ieee80211_encap_esfbuf_htc = 0x40000bd4;
/* Data (.data, .bss, .rodata) */ /* Data (.data, .bss, .rodata) */
net80211_funcs = 0x4087ffac; net80211_funcs = 0x4087ffac;
g_scan = 0x4087ffa8; g_scan = 0x4087ffa8;

12
components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -51,7 +51,7 @@ lmacRecycleMPDU = 0x40000c4c;
lmacRxDone = 0x40000c50; lmacRxDone = 0x40000c50;
//lmacSetTxFrame = 0x40000c54; //lmacSetTxFrame = 0x40000c54;
//lmacTxDone = 0x40000c58; //lmacTxDone = 0x40000c58;
lmacTxFrame = 0x40000c5c; //lmacTxFrame = 0x40000c5c;
mac_tx_set_duration = 0x40000c60; mac_tx_set_duration = 0x40000c60;
//mac_tx_set_plcp0 = 0x40000c64; //mac_tx_set_plcp0 = 0x40000c64;
//mac_tx_set_plcp1 = 0x40000c68; //mac_tx_set_plcp1 = 0x40000c68;
@ -173,8 +173,8 @@ pm_allow_tx = 0x40000e30;
ppProcTxCallback = 0x40000e38; ppProcTxCallback = 0x40000e38;
//mac_tx_set_hesig = 0x40000e3c; //mac_tx_set_hesig = 0x40000e3c;
ppCalPreFecPaddingFactor = 0x40000e40; ppCalPreFecPaddingFactor = 0x40000e40;
mac_tx_set_tb = 0x40000e44; //mac_tx_set_tb = 0x40000e44;
mac_tx_set_mplen = 0x40000e48; //mac_tx_set_mplen = 0x40000e48;
hal_get_tsf_timer = 0x40000e4c; hal_get_tsf_timer = 0x40000e4c;
ppTxPktForceWaked = 0x40000e50; ppTxPktForceWaked = 0x40000e50;
lmacProcessLongFrameSuccess = 0x40000e54; lmacProcessLongFrameSuccess = 0x40000e54;
@ -187,8 +187,8 @@ lmacProcessAckTimeout = 0x40000e68;
//ppRemoveHTC = 0x40000e70; //ppRemoveHTC = 0x40000e70;
get_estimated_batime = 0x40000e74; get_estimated_batime = 0x40000e74;
is_use_muedca = 0x40000e78; is_use_muedca = 0x40000e78;
hal_mac_tx_clr_mplen = 0x40000e7c; //hal_mac_tx_clr_mplen = 0x40000e7c;
hal_mac_get_txq_state = 0x40000e80; //hal_mac_get_txq_state = 0x40000e80;
hal_mac_clr_txq_state = 0x40000e84; hal_mac_clr_txq_state = 0x40000e84;
hal_mac_get_txq_complete = 0x40000e88; hal_mac_get_txq_complete = 0x40000e88;
ht_get_min_subframe_len = 0x40000e8c; ht_get_min_subframe_len = 0x40000e8c;

1
examples/mesh/ip_internal_network/sdkconfig.defaults
View File

@ -9,3 +9,4 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
CONFIG_PARTITION_TABLE_OFFSET=0x8000 CONFIG_PARTITION_TABLE_OFFSET=0x8000
CONFIG_PARTITION_TABLE_MD5=y CONFIG_PARTITION_TABLE_MD5=y
CONFIG_COMPILER_OPTIMIZATION_SIZE=y