Merge branch 'feat/usb_dfu_console_soc_caps_backport_v6.1' into 'release/v6.1'

feat(soc): add USB DFU and OTG console caps (backport v6.1)

See merge request espressif/esp-idf!49580
This commit is contained in:
Jiang Jiang Jian
2026-07-17 10:30:26 +08:00
16 changed files with 99 additions and 53 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ menu "ESP-STDIO"
config ESP_CONSOLE_USB_CDC
bool "USB CDC"
# && !TINY_USB is because the ROM CDC driver is currently incompatible with TinyUSB.
depends on (IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3) && !TINY_USB
depends on SOC_USB_OTG_CONSOLE_SUPPORTED && !TINY_USB
config ESP_CONSOLE_USB_SERIAL_JTAG
bool "USB Serial/JTAG Controller"
depends on SOC_USB_SERIAL_JTAG_SUPPORTED
@@ -111,6 +111,10 @@ config SOC_USB_OTG_SUPPORTED
bool
default y
config SOC_USB_DFU_SUPPORTED
bool
default y
config SOC_WIRELESS_HOST_SUPPORTED
bool
default y
@@ -50,6 +50,7 @@
#define SOC_ASYNC_MEMCPY_SUPPORTED 1
#define SOC_EMAC_SUPPORTED 1
#define SOC_USB_OTG_SUPPORTED 1
#define SOC_USB_DFU_SUPPORTED 1
#define SOC_WIRELESS_HOST_SUPPORTED 1
#define SOC_USB_SERIAL_JTAG_SUPPORTED 1
#define SOC_TEMP_SENSOR_SUPPORTED 1
@@ -47,6 +47,14 @@ config SOC_USB_OTG_SUPPORTED
bool
default y
config SOC_USB_DFU_SUPPORTED
bool
default y
config SOC_USB_OTG_CONSOLE_SUPPORTED
bool
default y
config SOC_PCNT_SUPPORTED
bool
default y
@@ -54,6 +54,8 @@
#define SOC_ULP_FSM_SUPPORTED 1
#define SOC_RISCV_COPROC_SUPPORTED 1
#define SOC_USB_OTG_SUPPORTED 1
#define SOC_USB_DFU_SUPPORTED 1
#define SOC_USB_OTG_CONSOLE_SUPPORTED 1
#define SOC_PCNT_SUPPORTED 1
#define SOC_PHY_SUPPORTED 1
#define SOC_WIFI_SUPPORTED 1
@@ -95,6 +95,14 @@ config SOC_USB_OTG_SUPPORTED
bool
default y
config SOC_USB_DFU_SUPPORTED
bool
default y
config SOC_USB_OTG_CONSOLE_SUPPORTED
bool
default y
config SOC_USB_SERIAL_JTAG_SUPPORTED
bool
default y
@@ -51,6 +51,8 @@
#define SOC_RISCV_COPROC_SUPPORTED 1
#define SOC_BT_SUPPORTED 1
#define SOC_USB_OTG_SUPPORTED 1
#define SOC_USB_DFU_SUPPORTED 1
#define SOC_USB_OTG_CONSOLE_SUPPORTED 1
#define SOC_USB_SERIAL_JTAG_SUPPORTED 1
#define SOC_CCOMP_TIMER_SUPPORTED 1
#define SOC_ASYNC_MEMCPY_SUPPORTED 1