If CONFIG_DISPLAY_BOARDINFO_LATE is enabled, U-Boot displays the banner again after relocation so that it is visible on the video display. Detect this and allow it.

Note: This patch is only an interim fix. If it is applied we should consider reverting it later since it is not needed if U-Boot is working correctly.

Signed-off-by: Simon Glass sjg@chromium.org Fixes: b089538 (Allow displaying the U-Boot banner on a video display) ---

test/py/u_boot_console_base.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index b1f474236e..3ea6b6a5d0 100644 --- a/test/py/u_boot_console_base.py +++ b/test/py/u_boot_console_base.py @@ -355,12 +355,31 @@ class ConsoleBase(object): self.u_boot_version_string = self.p.after while True: m = self.p.expect([self.prompt_compiled, - pattern_stop_autoboot_prompt] + self.bad_patterns) + pattern_stop_autoboot_prompt, pattern_u_boot_main_signon] + + self.bad_patterns) if m == 0: break if m == 1: self.p.send(' ') continue + + # If CONFIG_DISPLAY_BOARDINFO_LATE is defined then we will + # display the banner again after relocation. See + # console_announce_r() for the implementation. The original + # banner has two blank lines before it but this one has none. + # We can use this to distinguish a repeat of the banner from + # a reset of the board. Here we fail if we see even a single + # empty line in the characters leading up to the banner. + if m == 2: + before = self.p.before[-6:] + blank_lines = 0 + for ch in before: + if ch == '\n': + blank_lines += 1 + elif ch != '\r': + blank_lines = 0 + if blank_lines <= 1: + continue raise Exception('Bad pattern found on console: ' + self.bad_pattern_ids[m - 2]) self.at_prompt = True

Put the check for whether a console is a serial device in a function so that we can share the code in the two places that use it.

Signed-off-by: Simon Glass sjg@chromium.org ---

common/console.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/common/console.c b/common/console.c index c6156f33bb..80401acf5b 100644 --- a/common/console.c +++ b/common/console.c @@ -146,6 +146,21 @@ static int console_setfile(int file, struct stdio_dev * dev) return error; }

+/** + * console_dev_is_serial() - Check if a stdio device is a serial device + * + * @sdev: Device to check + * @return true if this device is a serial device + */ +static bool console_dev_is_serial(struct stdio_dev *sdev) +{ + bool is_serial; + + is_serial = !strcmp(sdev->name, "serial"); + + return is_serial; +} + #if CONFIG_IS_ENABLED(CONSOLE_MUX) /** Console I/O multiplexing *******************************************/

@@ -210,7 +225,7 @@ static void console_puts_noserial(int file, const char *s)

for (i = 0; i < cd_count[file]; i++) { dev = console_devices[file][i]; - if (dev->puts != NULL && strcmp(dev->name, "serial") != 0) + if (dev->puts != NULL && !console_dev_is_serial(dev)) dev->puts(dev, s); } } @@ -249,7 +264,7 @@ static inline void console_putc(int file, const char c)

static inline void console_puts_noserial(int file, const char *s) { - if (strcmp(stdio_devices[file]->name, "serial") != 0) + if (!console_dev_is_serial(stdio_devices[file])) stdio_devices[file]->puts(stdio_devices[file], s); }

With driver model the serial device is often not called "serial". Mark driver-model stdio devices so that they can be detected and we can look up the uclass. This is a more reliable way of finding out whether the console is connected to a serial device or not.

Signed-off-by: Simon Glass sjg@chromium.org ---

common/console.c | 11 ++++++++++- drivers/serial/serial-uclass.c | 2 +- include/stdio_dev.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/console.c b/common/console.c index 80401acf5b..e9164d7c9d 100644 --- a/common/console.c +++ b/common/console.c @@ -8,6 +8,7 @@ #include <common.h> #include <console.h> #include <debug_uart.h> +#include <dm.h> #include <stdarg.h> #include <iomux.h> #include <malloc.h> @@ -150,12 +151,20 @@ static int console_setfile(int file, struct stdio_dev * dev) * console_dev_is_serial() - Check if a stdio device is a serial device * * @sdev: Device to check - * @return true if this device is a serial device + * @return true if this device is in the serial uclass (or for pre-driver-model, + * whether it is called "serial". */ static bool console_dev_is_serial(struct stdio_dev *sdev) { bool is_serial;

+#ifdef CONFIG_DM_SERIAL + if (sdev->flags & DEV_FLAGS_DM) { + struct udevice *dev = sdev->priv; + + is_serial = device_get_uclass_id(dev) == UCLASS_SERIAL; + } else +#endif is_serial = !strcmp(sdev->name, "serial");

return is_serial; diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index f360534683..db51863598 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -353,7 +353,7 @@ static int serial_post_probe(struct udevice *dev) memset(&sdev, '\0', sizeof(sdev));

strncpy(sdev.name, dev->name, sizeof(sdev.name)); - sdev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT; + sdev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_DM; sdev.priv = dev; sdev.putc = serial_stub_putc; sdev.puts = serial_stub_puts; diff --git a/include/stdio_dev.h b/include/stdio_dev.h index e4fc8b138b..3164fa2a55 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -16,6 +16,7 @@

#define DEV_FLAGS_INPUT 0x00000001 /* Device can be used as input console */ #define DEV_FLAGS_OUTPUT 0x00000002 /* Device can be used as output console */ +#define DEV_FLAGS_DM 0x00000004 /* Device priv is a struct udevice * */

/* Device information */ struct stdio_dev {