Merge branch 'bugfix/uart_sw_flow_ctrl_xoff_char_v6.1' into 'release/v6.1'

fix(uart): fix uart sw flow ctrl XOFF char write to wrong reg on ESP32C6 (v6.1)

See merge request espressif/esp-idf!50523
This commit is contained in:
morris
2026-07-29 18:57:00 +08:00
13 changed files with 480 additions and 69 deletions

View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2020-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -63,8 +63,9 @@ void bootloader_console_init(void)
const int uart_tx_gpio = (CONFIG_ESP_CONSOLE_UART_TX_GPIO >= 0) ? CONFIG_ESP_CONSOLE_UART_TX_GPIO : U0TXD_GPIO_NUM;
const int uart_rx_gpio = (CONFIG_ESP_CONSOLE_UART_RX_GPIO >= 0) ? CONFIG_ESP_CONSOLE_UART_RX_GPIO : U0RXD_GPIO_NUM;
// Switch to the new UART (this just changes UART number used for esp_rom_printf in ROM code).
esp_rom_output_set_as_console(uart_num);
// Switch to the new UART
esp_rom_output_set_as_console(uart_num); // changes UART number used for esp_rom_printf in ROM code
esp_rom_output_switch_buffer(uart_num);
// If console is attached to UART1 or if non-default pins are used,
// need to reconfigure pins using GPIO matrix