Skip to content

espressif: fix UART init for Serial Recovery and unify adapter code #2532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
almir-okato merged 1 commit into from
Nov 5, 2025
Merged

espressif: fix UART init for Serial Recovery and unify adapter code #2532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boot/espressif/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ if(CONFIG_ESP_MCUBOOT_SERIAL)
${ZCBOR_DIR}/include
)
list(APPEND port_srcs
${CMAKE_CURRENT_LIST_DIR}/port/${MCUBOOT_TARGET}/serial_adapter.c
${CMAKE_CURRENT_LIST_DIR}/port/serial_adapter.c
${MBEDTLS_DIR}/library/base64.c
)
list(APPEND CRYPTO_INC
Expand Down
2 changes: 2 additions & 0 deletions boot/espressif/port/esp32/bootloader.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ CONFIG_ESP_SCRATCH_SIZE=0x40000
# CONFIG_ESP_SERIAL_BOOT_GPIO_RX=25
# GPIO for Serial TX signal
# CONFIG_ESP_SERIAL_BOOT_GPIO_TX=26
# Baudrate for Serial Recovery communication
# CONFIG_ESP_SERIAL_BOOT_BAUDRATE=115200

CONFIG_ESP_CONSOLE_UART=y
CONFIG_ESP_CONSOLE_UART_NUM=0
Expand Down
185 changes: 0 additions & 185 deletions boot/espressif/port/esp32/serial_adapter.c
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions boot/espressif/port/esp32c2/bootloader.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ CONFIG_ESP_SCRATCH_SIZE=0x40000
# CONFIG_ESP_SERIAL_BOOT_GPIO_RX=2
# GPIO for Serial TX signal
# CONFIG_ESP_SERIAL_BOOT_GPIO_TX=3
# Baudrate for Serial Recovery communication
# CONFIG_ESP_SERIAL_BOOT_BAUDRATE=115200

# Use UART0 for console printing (use either UART or USB alone)
CONFIG_ESP_CONSOLE_UART=y
Expand Down
Loading
Loading