espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 05:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/bringup_usj_esp32c6' into 'master'

Browse Source 
usb_serial_jtag: add support for esp32c6

Closes IDF-5330

See merge request espressif/esp-idf!21319
This commit is contained in:
C.S.M
2022-11-30 01:55:38 +08:00
parent 81fa1ecb6d a57500d29c
commit 593335578f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_system/Kconfig
View File

@@ -229,7 +229,7 @@ menu "ESP System Settings"
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_ESP32C3 #ESPTOOL-252 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 config ESP_CONSOLE_UART_CUSTOM
bool "Custom UART" bool "Custom UART"
config ESP_CONSOLE_NONE config ESP_CONSOLE_NONE
@@ -237,7 +237,7 @@ menu "ESP System Settings"
endchoice endchoice
choice ESP_CONSOLE_SECONDARY 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" prompt "Channel for console secondary output"
default ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG default ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG
help help