From: Angus Gratton <angus@espressif.com>
Date: Wed, 29 May 2019 06:28:37 +0000 (+0800)
Subject: Merge branch 'bugfix/reset_log_uart_port' into 'master'
X-Git-Tag: v4.0-beta1~300
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73b90387cb1f1614369376ecdb5b70bd2696e872;p=esp-idf

Merge branch 'bugfix/reset_log_uart_port' into 'master'

esp32: Add reset CONSOLE_UART port

See merge request idf/esp-idf!5011
---

73b90387cb1f1614369376ecdb5b70bd2696e872
diff --cc components/bootloader_support/src/bootloader_init.c
index ca0f435df3,9e6aa9e46b..52476e3876
--- a/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)