Merge branch 'bugfix/fix_esp32c5_ersu_compatibility_issue_v5.5' into 'release/v5.5'

Jiang Jiang Jian · Jiang Jiang Jian · commit 92df7573a421 · 2025-08-21T20:02:13.000+08:00
fix(wifi): fix ersu compatibility issue(Backport v5.5)

See merge request espressif/esp-idf!41385
diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.net80211.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.net80211.ld
@@ -40,7 +40,7 @@ ieee80211_ampdu_start_age_timer = 0x40000b5c;
 ieee80211_is_tx_allowed = 0x40000b64;
 ieee80211_output_pending_eb = 0x40000b68;
 ieee80211_output_process = 0x40000b6c;
-ieee80211_set_tx_desc = 0x40000b70;
+/*ieee80211_set_tx_desc = 0x40000b70;*/
 ieee80211_classify = 0x40000b74;
 ieee80211_copy_eb_header = 0x40000b78;
 ieee80211_recycle_cache_eb = 0x40000b7c;
diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.net80211.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.net80211.ld
@@ -36,7 +36,7 @@ ieee80211_ampdu_start_age_timer = 0x40000ac4;
 ieee80211_is_tx_allowed = 0x40000acc;
 ieee80211_output_pending_eb = 0x40000ad0;
 ieee80211_output_process = 0x40000ad4;
-ieee80211_set_tx_desc = 0x40000ad8;
+/*ieee80211_set_tx_desc = 0x40000ad8;*/
 ieee80211_classify = 0x40000adc;
 ieee80211_copy_eb_header = 0x40000ae0;
 ieee80211_recycle_cache_eb = 0x40000ae4;
diff --git a/examples/protocols/mqtt/ssl_psk/sdkconfig.defaults b/examples/protocols/mqtt/ssl_psk/sdkconfig.defaults
@@ -1 +1,2 @@
 CONFIG_ESP_TLS_PSK_VERIFICATION=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
diff --git a/examples/protocols/mqtt5/sdkconfig.defaults b/examples/protocols/mqtt5/sdkconfig.defaults
@@ -1 +1,2 @@
 CONFIG_MQTT_PROTOCOL_5=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`CONFIG_ESP_TLS_PSK_VERIFICATION=y`
	`2`	`+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`CONFIG_MQTT_PROTOCOL_5=y`
	`2`	`+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y`