diff --git a/components/esp_phy/lib b/components/esp_phy/lib
index 0c849b3d31..84a5574221 160000
--- a/components/esp_phy/lib
+++ b/components/esp_phy/lib
@@ -1 +1 @@
-Subproject commit 0c849b3d31d44c797c2b48f1b9c1607a8c6c4f82
+Subproject commit 84a55742211a32d3f68a6281a7180349ec165cfb
diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.phy.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.phy.ld
index 82722f83ca..d7ab643c47 100644
--- a/components/esp_rom/esp32c61/ld/esp32c61.rom.phy.ld
+++ b/components/esp_rom/esp32c61/ld/esp32c61.rom.phy.ld
@@ -305,7 +305,9 @@ phy_rate_to_index = 0x400014b8;
 phy_get_target_pwr = 0x400014bc;
 phy_get_max_pwr = 0x400014c0;
 phy_get_pwr_index = 0x400014c4;
-phy_chip_set_chan_ana = 0x40005a8a;
+phy_chip_set_chan_ana = 0x400014d4;
+phy_get_romfuncs = 0x400014d8;
 /* Data (.data, .bss, .rodata) */
 phy_param_rom = 0x4084fc6c;
 rom_phyFuns = 0x4084fb84;
+rom_phyFuns_eco2 = 0x4084fc68;
diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld
index 0329814f33..7362e8be00 100644
--- a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld
+++ b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld
@@ -53,6 +53,9 @@ hal_tsf_get_tbttstart = 0x40000bcc;
 hal_get_tsf_time = 0x40000bd0;
 hal_get_sta_tsf = 0x40000bd4;
 tsf_hal_get_tbtt_interval = 0x40000bd8;
+tsf_hal_get_time = 0x400014cc;
+/*pm_get_tbtt_count = 0x400014c8;*/
+tsf_hal_get_counter_value = 0x400014d0;
 dbg_hal_check_clr_mplen_bitmap = 0x40000bdc;
 dbg_hal_check_set_mplen_bitmap = 0x40000be0;
 ic_get_trc = 0x40000be4;
@@ -76,14 +79,14 @@ lmacReachLongLimit = 0x40000c28;
 lmacReachShortLimit = 0x40000c2c;
 lmacRecycleMPDU = 0x40000c30;
 lmacRxDone = 0x40000c34;
-/*lmacSetTxFrame = 0x40000c38;*/
+lmacSetTxFrame = 0x40000c38;
 lmacTxDone = 0x40000c3c;
 lmacTxFrame = 0x40000c40;
 lmacDisableTransmit = 0x40000c44;
 lmacDiscardFrameExchangeSequence = 0x40000c48;
 lmacProcessCollision = 0x40000c4c;
 lmacProcessAckTimeout = 0x40000c50;
-/*lmacProcessShortRetryFail = 0x40000c54;*/
+lmacProcessShortRetryFail = 0x40000c54;
 lmacProcessCollisions_task = 0x40000c58;
 lmacProcessTxRtsError = 0x40000c5c;
 lmacProcessTxError = 0x40000c60;
@@ -119,7 +122,7 @@ pm_local_tsf_process = 0x40000cd4;
 pm_set_beacon_filter = 0x40000cd8;
 pm_is_in_wifi_slice_threshold = 0x40000cdc;
 pm_is_waked = 0x40000ce0;
-/*pm_keep_alive = 0x40000ce4;*/
+pm_keep_alive = 0x40000ce4;
 pm_on_beacon_rx = 0x40000ce8;
 pm_on_data_rx = 0x40000cec;
 pm_on_data_tx = 0x40000cf0;
@@ -137,7 +140,7 @@ pm_rx_data_process = 0x40000d1c;
 pm_sleep = 0x40000d20;
 pm_sleep_for = 0x40000d24;
 /*pm_tbtt_process = 0x40000d28;*/
-/*pm_tx_data_done_process = 0x40000d2c;*/
+pm_tx_data_done_process = 0x40000d2c;
 pm_allow_tx = 0x40000d30;
 pm_extend_tbtt_adaptive_servo = 0x40000d34;
 pm_scale_listen_interval = 0x40000d38;
@@ -146,7 +149,7 @@ pm_disconnected_wake = 0x40000d40;
 /*pm_tx_data_process = 0x40000d44;*/
 pm_is_twt_awake = 0x40000d48;
 pm_enable_twt_keep_alive = 0x40000d4c;
-/*pm_twt_on_tsf_timer = 0x40000d50;*/
+pm_twt_on_tsf_timer = 0x40000d50;
 pm_twt_process = 0x40000d54;
 pm_is_twt_start = 0x40000d58;
 pm_twt_set_target_wdev_time = 0x40000d5c;
@@ -197,7 +200,7 @@ ppSearchTxQueue = 0x40000e0c;
 ppSearchTxframe = 0x40000e10;
 ppSelectNextQueue = 0x40000e14;
 ppSubFromAMPDU = 0x40000e18;
-/*ppTask = 0x40000e1c;*/
+ppTask = 0x40000e1c;
 ppTxPkt = 0x40000e20;
 ppTxProtoProc = 0x40000e24;
 ppTxqUpdateBitmap = 0x40000e28;
@@ -241,13 +244,13 @@ rcSetTxAmpduLimit = 0x40000ebc;
 rcTxUpdatePer = 0x40000ec0;
 rcUpdateAckSnr = 0x40000ec4;
 rcUpdateRate = 0x40000ec8;
-/*rcUpdateTxDone = 0x40000ecc;*/
-/*rcUpdateTxDoneAmpdu2 = 0x40000ed0;*/
+rcUpdateTxDone = 0x40000ecc;
+rcUpdateTxDoneAmpdu2 = 0x40000ed0;
 rcUpSched = 0x40000ed4;
 rcReachRetryLimit = 0x40000ed8;
 rcGetDCMMaxRate = 0x40000edc;
 rcGetSMPDURate = 0x40000ee0;
-/*rcGetRate = 0x40000ee4;*/
+rcGetRate = 0x40000ee4;
 rx11AXRate2AMPDULimit = 0x40000ee8;
 rx11NRate2AMPDULimit = 0x40000eec;
 rssi_margin = 0x40000ef0;
@@ -263,7 +266,7 @@ trcAmpduSetState = 0x40000f14;
 trc_set_bf_report_rate = 0x40000f18;
 trc_onPPTxDone = 0x40000f1c;
 wDevCheckBlockError = 0x40000f20;
-/*wDev_AppendRxBlocks = 0x40000f24;*/
+wDev_AppendRxBlocks = 0x40000f24;
 wDev_DiscardFrame = 0x40000f28;
 wDev_GetNoiseFloor = 0x40000f2c;
 wDev_IndicateAmpdu = 0x40000f30;
@@ -275,7 +278,7 @@ wdev_mac_special_reg_store = 0x40000f44;
 wdev_mac_wakeup = 0x40000f48;
 wdev_mac_sleep = 0x40000f4c;
 wDev_ProcessFiq = 0x40000f50;
-/*wDev_ProcessRxSucData = 0x40000f54;*/
+wDev_ProcessRxSucData = 0x40000f54;
 wdevProcessRxSucDataAll = 0x40000f58;
 wdev_csi_len_align = 0x40000f5c;
 wDev_IndicateBeaconMemoryFrame = 0x40000f60;
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index b15699a76c..8848c2e127 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit b15699a76c068ab7d7dc6cbee53eb6d559fe646f
+Subproject commit 8848c2e127a25df01856404761de8eab89dee958