diff options
| -rw-r--r-- | src/console/init.c | 2 | ||||
| -rw-r--r-- | src/lib/cbmem_console.c | 4 | ||||
| -rw-r--r-- | util/cbmem/cbmem.c | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/console/init.c b/src/console/init.c index 91d6492e4d..1029e6b14f 100644 --- a/src/console/init.c +++ b/src/console/init.c @@ -71,6 +71,6 @@ asmlinkage void console_init(void) console_hw_init(); - printk(BIOS_INFO, "\n\ncoreboot-%s%s %s " ENV_STRING " starting...\n", + printk(BIOS_NOTICE, "\n\ncoreboot-%s%s %s " ENV_STRING " starting...\n", coreboot_version, coreboot_extra_version, coreboot_build); } diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c index eb0cc93ee4..b0008b1d9c 100644 --- a/src/lib/cbmem_console.c +++ b/src/lib/cbmem_console.c @@ -156,8 +156,8 @@ static void copy_console_buffer(struct cbmem_console *src_cons_p) return; if (src_cons_p->cursor & OVERFLOW) { - const char overflow_warning[] = "\n*** Pre-CBMEM console " - "overflowed, log truncated ***\n"; + const char overflow_warning[] = "\n*** Pre-CBMEM " ENV_STRING + " console overflowed, log truncated! ***\n"; for (c = 0; c < sizeof(overflow_warning) - 1; c++) cbmemc_tx_byte(overflow_warning[c]); for (c = src_cons_p->cursor & CURSOR_MASK; diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index 48a1bc963d..daa7b566ca 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -670,9 +670,12 @@ static void dump_console(int one_boot_only) cursor = 0; if (one_boot_only) { #define BANNER_REGEX(stage) "\n\ncoreboot-[^\n]* " stage " starting\\.\\.\\.\n" +#define OVERFLOW_REGEX(stage) "\n*** Pre-CBMEM " stage " console overflowed" const char *regex[] = { BANNER_REGEX("bootblock"), BANNER_REGEX("romstage"), - BANNER_REGEX("ramstage")}; + OVERFLOW_REGEX("romstage"), + BANNER_REGEX("ramstage"), + OVERFLOW_REGEX("ramstage") }; int i; for (i = 0; !cursor && i < ARRAY_SIZE(regex); i++) { |