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/s3_otg_compressed_flash_with_stub_v4.4' into 'release/v4.4'

Browse Source 
esptool_py: Support ESP32-S3 USB OTG compressed flashing with stub (v4.4)

See merge request espressif/esp-idf!17780
This commit is contained in:
Roland Dobai 2022-04-19 21:45:21 +08:00
commit 76037c66d8
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp_system/Kconfig
View File

@ -227,7 +227,6 @@ menu "ESP System Settings"
depends on (IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3) && !TINY_USB
config ESP_CONSOLE_USB_SERIAL_JTAG
bool "USB Serial/JTAG Controller"
select ESPTOOLPY_NO_STUB if IDF_TARGET_ESP32S3 #ESPTOOL-251
select ESPTOOLPY_NO_STUB if IDF_TARGET_ESP32C3 #ESPTOOL-252
depends on IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3
config ESP_CONSOLE_UART_CUSTOM

12
components/esptool_py/Kconfig.projbuild
View File

@ -144,10 +144,14 @@ 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 h2, because not consistent with esptool, will be cleaned up in IDF-4474
default "80m" if ESPTOOLPY_FLASHFREQ_80M && !IDF_TARGET_ESP32H2
default "40m" if ESPTOOLPY_FLASHFREQ_40M && !IDF_TARGET_ESP32H2
default "26m" if ESPTOOLPY_FLASHFREQ_26M && !IDF_TARGET_ESP32H2
default "20m" if ESPTOOLPY_FLASHFREQ_20M && !IDF_TARGET_ESP32H2
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

2
components/esptool_py/esptool

@ -1 +1 @@
Subproject commit 66e1f163a4f9a32041ec48b8aa7ab958831f8410
Subproject commit aca9d70bd810c25bc953ca2f7587892c4dbaffc4