usb_serial_jtag: can print when wifi enabled by default

Closes https://github.com/espressif/esp-idf/issues/8131
This commit is contained in:
Cao Sen Miao
2021-12-22 12:44:00 +08:00
parent 7bb51e9a67
commit d64553797c
2 changed files with 12 additions and 5 deletions

View File

@@ -415,10 +415,11 @@ menu "PHY"
config ESP_PHY_ENABLE_USB
bool "Enable USB when phy init"
depends on ESP_CONSOLE_USB_SERIAL_JTAG
default y
depends on USB_OTG_SUPPORTED || ESP_CONSOLE_USB_SERIAL_JTAG || ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG
default y if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3
default n
help
When using USB Serial/JTAG controller, PHY should enable USB, otherwise log will
not be displayed. But working with USB, the RF performance may be affected.
When using USB Serial/JTAG/OTG/CDC, PHY should enable USB, otherwise USB module
can not work properly. Notice: Enabling this configuration option will slightly impact wifi performance.
endmenu # PHY

View File

@@ -613,7 +613,13 @@ void esp_phy_load_cal_and_init(void)
#endif
#if CONFIG_ESP_PHY_ENABLE_USB
phy_bbpll_en_usb(true);
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG
if (usb_serial_jtag_ll_txfifo_writable() == 1)
#endif // Only check usb_jtag status with usb_jtag related config options enabled.
{
// If the USB_SEIRAL_JTAG is really in use.
phy_bbpll_en_usb(true);
}
#endif
#ifdef CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE