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

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

See merge request espressif/esp-idf!18752

components/esp32s2/clk.c

@@ -82,6 +82,12 @@ void esp_clk_init(void)
     RESET_REASON rst_reas;
     rst_reas = rtc_get_reset_reason(0);
     if (rst_reas == POWERON_RESET) {
+        /* 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) {
+            uart_tx_wait_idle(CONFIG_ESP_CONSOLE_UART_NUM);
+        }
         cfg.cali_ocode = 1;
     }
     rtc_init(cfg);