Commit 220ddc08 authored by Milton Miller's avatar Milton Miller Committed by Paul Mackerras

[POWERPC] Fix console output getting dropped on platforms without udbg_putc

Previously, registering this early console would just result
in dropping early buffered printk output until a udbg_putc
was registered.

However, commit 69331af7
clears the CON_PRINTBUFFER flag on the main console when a
CON_BOOT (early) console has been registered, resulting in
the buffered messages never being displayed to the user.

This fixes the problem by making sure we don't register udbg_console
on platforms that don't implement udbg_putc.
Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
Acked-by: default avatarMark A. Greer <mgreer@mvista.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent c63c4faa
...@@ -151,12 +151,18 @@ static struct console udbg_console = { ...@@ -151,12 +151,18 @@ static struct console udbg_console = {
static int early_console_initialized; static int early_console_initialized;
/* called by setup_system */ /*
* Called by setup_system after ppc_md->probe and ppc_md->early_init.
* Call it again after setting udbg_putc in ppc_md->setup_arch.
*/
void register_early_udbg_console(void) void register_early_udbg_console(void)
{ {
if (early_console_initialized) if (early_console_initialized)
return; return;
if (!udbg_putc)
return;
if (strstr(boot_command_line, "udbg-immortal")) { if (strstr(boot_command_line, "udbg-immortal")) {
printk(KERN_INFO "early console immortal !\n"); printk(KERN_INFO "early console immortal !\n");
udbg_console.flags &= ~CON_BOOT; udbg_console.flags &= ~CON_BOOT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment