Merge branch 'bugfix/s3_otg_compressed_flash_with_stub' into 'master'

esptool_py: Support ESP32-S3 USB OTG compressed flashing with stub

Closes ESPTOOL-372

See merge request espressif/esp-idf!17559
This commit is contained in:
Roland Dobai
2022-04-14 18:26:18 +08:00
2 changed files with 1 additions and 2 deletions

View File

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