diff options
author | Tom Rini <trini@konsulko.com> | 2025-10-06 13:20:24 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2025-10-06 13:20:24 -0600 |
commit | 0eaa4b337336dbbe93395d1f2ccc18937eaafea2 (patch) | |
tree | c01e661d69181dceca68f56a4849a9bd04608521 /drivers/serial/serial-uclass.c | |
parent | e50b1e8715011def8aff1588081a2649a2c6cd47 (diff) | |
parent | 4e4a9de31de2a5f395ee25c59e4026422fbcb27e (diff) |
Merge branch 'next'
Merge the outstanding changes from the 'next' branch to master.
Diffstat (limited to 'drivers/serial/serial-uclass.c')
-rw-r--r-- | drivers/serial/serial-uclass.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index a08678dde4e..7b381ca12a0 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -191,7 +191,8 @@ int serial_init(void) { #if CONFIG_IS_ENABLED(SERIAL_PRESENT) serial_find_console_or_panic(); - gd->flags |= GD_FLG_SERIAL_READY; + if (gd->cur_serial_dev) + gd->flags |= GD_FLG_SERIAL_READY; if (IS_ENABLED(CONFIG_OF_SERIAL_BAUD)) { int ret = 0; |