Merge branch 'bugfix/reset_log_uart_port' into 'master'

esp32: Add reset CONSOLE_UART port

See merge request idf/esp-idf!5011

diff --cc components/bootloader_support/src/bootloader_init.c
index ca0f435df3120ebd3a1c7f6d6f5f39850b061a71,9e6aa9e46b02288e9f2db7d1e9d6fdbe59b37760..52476e387656ae956c1b42003e835d985f7f6cf5
--- 1/components/bootloader_support/src/bootloader_init.c
--- 2/components/bootloader_support/src/bootloader_init.c
+++ b/components/bootloader_support/src/bootloader_init.c
@@@ -449,14 -450,17 +450,17 @@@ static void uart_console_configure(void
  
          gpio_matrix_out(uart_tx_gpio, tx_idx, 0, 0);
          gpio_matrix_in(uart_rx_gpio, rx_idx, 0);
+ 
+         DPORT_SET_PERI_REG_MASK(DPORT_PERIP_RST_EN_REG, uart_reset[uart_num]);
+         DPORT_CLEAR_PERI_REG_MASK(DPORT_PERIP_RST_EN_REG, uart_reset[uart_num]);
      }
 -#endif // CONFIG_CONSOLE_UART_CUSTOM
 +#endif // CONFIG_ESP_CONSOLE_UART_CUSTOM
  
      // Set configured UART console baud rate
 -    const int uart_baud = CONFIG_CONSOLE_UART_BAUDRATE;
 +    const int uart_baud = CONFIG_ESP_CONSOLE_UART_BAUDRATE;
      uart_div_modify(uart_num, (rtc_clk_apb_freq_get() << 4) / uart_baud);
  
 -#endif // CONFIG_CONSOLE_UART_NONE
 +#endif // CONFIG_ESP_CONSOLE_UART_NONE
  }
  
  static void wdt_reset_cpu0_info_enable(void)