diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-28 11:28:31 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-28 11:28:31 -0500 |
| commit | 87a9aa604de8a4a50642e25b88af328ab375893b (patch) | |
| tree | 863b4beef53827cddf2813dd7627aaa0bac62cda /common/console.c | |
| parent | 111a8b57354bb5aff55635502a0cdf74cb63e835 (diff) | |
| parent | 92302ab1a279859824ec0f2e3864be44e883bff9 (diff) | |
Merge tag 'video-next-20211228' of https://source.denx.de/u-boot/custodians/u-boot-video into next
- various fixes to the sandbox display support
- support for showing a logo without splash screen config
- support for BMP drawing to depths other than 16bpp
- tests for the different types of supported BMP images
- support showing a logo when running coreboot via qemu
Diffstat (limited to 'common/console.c')
| -rw-r--r-- | common/console.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/common/console.c b/common/console.c index 0c9099ca52..2bccc8ab10 100644 --- a/common/console.c +++ b/common/console.c @@ -348,7 +348,8 @@ static void console_puts_select(int file, bool serial_only, const char *s) void console_puts_select_stderr(bool serial_only, const char *s) { - console_puts_select(stderr, serial_only, s); + if (gd->flags & GD_FLG_DEVINIT) + console_puts_select(stderr, serial_only, s); } static void console_puts(int file, const char *s) @@ -401,7 +402,8 @@ static inline void console_putc(int file, const char c) void console_puts_select(int file, bool serial_only, const char *s) { - if (serial_only == console_dev_is_serial(stdio_devices[file])) + if ((gd->flags & GD_FLG_DEVINIT) && + serial_only == console_dev_is_serial(stdio_devices[file])) stdio_devices[file]->puts(stdio_devices[file], s); } |