Merge branch 'bugfix/esp32s2_startup_garbled_output_v4.4' into 'release/v4.4'

esp_system: fix garbled UART output on startup on esp32s2 (v4.4)

See merge request espressif/esp-idf!18750
This commit is contained in:
Jiang Jiang Jian
2022-06-30 16:52:11 +08:00

View File

@ -71,6 +71,12 @@ static void select_rtc_slow_clk(slow_clk_sel_t slow_clk);
soc_reset_reason_t rst_reas = esp_rom_get_reset_reason(0); soc_reset_reason_t rst_reas = esp_rom_get_reset_reason(0);
if (rst_reas == RESET_REASON_CHIP_POWER_ON) { if (rst_reas == RESET_REASON_CHIP_POWER_ON) {
cfg.cali_ocode = 1; cfg.cali_ocode = 1;
/* Ocode calibration will switch to XTAL frequency, need to wait for UART FIFO
* to be empty, to avoid garbled output.
*/
if (CONFIG_ESP_CONSOLE_UART_NUM >= 0) {
esp_rom_uart_tx_wait_idle(CONFIG_ESP_CONSOLE_UART_NUM);
}
} }
rtc_init(cfg); rtc_init(cfg);