diff --git a/components/esptool_py/Kconfig.projbuild b/components/esptool_py/Kconfig.projbuild
index 02768d44ca..99793b6961 100644
--- a/components/esptool_py/Kconfig.projbuild
+++ b/components/esptool_py/Kconfig.projbuild
@@ -92,10 +92,17 @@ menu "Serial flasher config"
         # On some of the ESP chips, max boot frequency would be equal to (or even lower than) 80m.
         # We currently define this to `80m`.
         default "80m" if ESPTOOLPY_FLASHFREQ_120M
-        default "80m" if ESPTOOLPY_FLASHFREQ_80M
-        default "40m" if ESPTOOLPY_FLASHFREQ_40M
-        default "26m" if ESPTOOLPY_FLASHFREQ_26M
-        default "20m" if ESPTOOLPY_FLASHFREQ_20M
+        # Temporarily support c2 and h2, because not consistent with esptool, will be cleaned up in IDF-4474
+        default "80m" if ESPTOOLPY_FLASHFREQ_80M && !IDF_TARGET_ESP32C2 && !IDF_TARGET_ESP32H2
+        default "40m" if ESPTOOLPY_FLASHFREQ_40M && !IDF_TARGET_ESP32C2 && !IDF_TARGET_ESP32H2
+        default "26m" if ESPTOOLPY_FLASHFREQ_26M && !IDF_TARGET_ESP32C2 && !IDF_TARGET_ESP32H2
+        default "20m" if ESPTOOLPY_FLASHFREQ_20M && !IDF_TARGET_ESP32C2 && !IDF_TARGET_ESP32H2
+        default "60m" if ESPTOOLPY_FLASHFREQ_80M && IDF_TARGET_ESP32C2
+        default "30m" if ESPTOOLPY_FLASHFREQ_40M && IDF_TARGET_ESP32C2
+        default "15m" if ESPTOOLPY_FLASHFREQ_20M && IDF_TARGET_ESP32C2
+        default "48m" if ESPTOOLPY_FLASHFREQ_80M && IDF_TARGET_ESP32H2
+        default "24m" if ESPTOOLPY_FLASHFREQ_40M && IDF_TARGET_ESP32H2
+        default "12m" if ESPTOOLPY_FLASHFREQ_20M && IDF_TARGET_ESP32H2
 
 
     choice ESPTOOLPY_FLASHSIZE
diff --git a/components/esptool_py/esptool b/components/esptool_py/esptool
index 66e1f163a4..eb98bb33e7 160000
--- a/components/esptool_py/esptool
+++ b/components/esptool_py/esptool
@@ -1 +1 @@
-Subproject commit 66e1f163a4f9a32041ec48b8aa7ab958831f8410
+Subproject commit eb98bb33e707869a43115529765eba23eb48fb0e