diff --git a/components/bootloader_support/src/bootloader_console.c b/components/bootloader_support/src/bootloader_console.c index 291dee0afba..fb56ca94da0 100644 --- a/components/bootloader_support/src/bootloader_console.c +++ b/components/bootloader_support/src/bootloader_console.c @@ -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 diff --git a/components/esp_stdio/test_apps/stdio/sdkconfig.ci.custom_uart b/components/esp_stdio/test_apps/stdio/sdkconfig.ci.custom_uart index 80ed1761ac2..56ee759e76b 100644 --- a/components/esp_stdio/test_apps/stdio/sdkconfig.ci.custom_uart +++ b/components/esp_stdio/test_apps/stdio/sdkconfig.ci.custom_uart @@ -1 +1,2 @@ CONFIG_ESP_CONSOLE_UART_CUSTOM=y +CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1=y diff --git a/components/esp_system/port/cpu_start.c b/components/esp_system/port/cpu_start.c index c67af37d0df..f702507d539 100644 --- a/components/esp_system/port/cpu_start.c +++ b/components/esp_system/port/cpu_start.c @@ -265,6 +265,9 @@ void ESP_SYSTEM_IRAM_ATTR call_start_cpu1(void) #elif !CONFIG_ESP_CONSOLE_USB_CDC esp_rom_install_uart_printf(); esp_rom_output_set_as_console(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM); +#if CONFIG_ESP_CONSOLE_UART_CUSTOM + esp_rom_output_switch_buffer(CONFIG_ESP_CONSOLE_UART_NUM); +#endif #endif cpu_utility_ll_enable_debug(1);