Merge branch 'feature/bringup_usj_esp32c6' into 'master'

usb_serial_jtag: add support for esp32c6

Closes IDF-5330

See merge request espressif/esp-idf!21319
pull/8689/merge
C.S.M 2022-11-30 01:55:38 +08:00
commit 593335578f
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -229,7 +229,7 @@ menu "ESP System Settings"
config ESP_CONSOLE_USB_SERIAL_JTAG
bool "USB Serial/JTAG Controller"
select ESPTOOLPY_NO_STUB if IDF_TARGET_ESP32C3 #ESPTOOL-252
depends on IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3
depends on SOC_USB_SERIAL_JTAG_SUPPORTED
config ESP_CONSOLE_UART_CUSTOM
bool "Custom UART"
config ESP_CONSOLE_NONE
@ -237,7 +237,7 @@ menu "ESP System Settings"
endchoice
choice ESP_CONSOLE_SECONDARY
depends on IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3
depends on SOC_USB_SERIAL_JTAG_SUPPORTED
prompt "Channel for console secondary output"
default ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG
help