提交 7671fa22 编写于 作者: S Sam Ravnborg 提交者: David S. Miller

sparc32: always register a PROM based early console

Do not require user to add "-p" to boot arguments to see
early info printed to prom console.

This is similar to the sparc64 functionality - which was added with:
3c62a2d3 ("[SPARC64]: Always register
a PROM based early console.")
Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 9c2853af
...@@ -114,7 +114,7 @@ int cpu_get_hwmid(phandle prom_node) ...@@ -114,7 +114,7 @@ int cpu_get_hwmid(phandle prom_node)
void __init device_scan(void) void __init device_scan(void)
{ {
prom_printf("Booting Linux...\n"); printk(KERN_NOTICE "Booting Linux...\n");
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
{ {
......
...@@ -326,7 +326,6 @@ void __init of_console_init(void) ...@@ -326,7 +326,6 @@ void __init of_console_init(void)
of_console_options = NULL; of_console_options = NULL;
} }
prom_printf(msg, of_console_path);
printk(msg, of_console_path); printk(msg, of_console_path);
} }
......
...@@ -109,10 +109,10 @@ prom_console_write(struct console *con, const char *s, unsigned n) ...@@ -109,10 +109,10 @@ prom_console_write(struct console *con, const char *s, unsigned n)
prom_write(s, n); prom_write(s, n);
} }
static struct console prom_debug_console = { static struct console prom_early_console = {
.name = "debug", .name = "earlyprom",
.write = prom_console_write, .write = prom_console_write,
.flags = CON_PRINTBUFFER, .flags = CON_PRINTBUFFER | CON_BOOT,
.index = -1, .index = -1,
}; };
...@@ -133,8 +133,7 @@ static void __init process_switch(char c) ...@@ -133,8 +133,7 @@ static void __init process_switch(char c)
prom_halt(); prom_halt();
break; break;
case 'p': case 'p':
/* Use PROM debug console. */ /* Just ignore, this behavior is now the default. */
register_console(&prom_debug_console);
break; break;
default: default:
printk("Unknown boot switch (-%c)\n", c); printk("Unknown boot switch (-%c)\n", c);
...@@ -215,6 +214,10 @@ void __init setup_arch(char **cmdline_p) ...@@ -215,6 +214,10 @@ void __init setup_arch(char **cmdline_p)
strcpy(boot_command_line, *cmdline_p); strcpy(boot_command_line, *cmdline_p);
parse_early_param(); parse_early_param();
boot_flags_init(*cmdline_p);
register_console(&prom_early_console);
/* Set sparc_cpu_model */ /* Set sparc_cpu_model */
sparc_cpu_model = sun_unknown; sparc_cpu_model = sun_unknown;
if (!strcmp(&cputypval[0], "sun4 ")) if (!strcmp(&cputypval[0], "sun4 "))
...@@ -265,7 +268,6 @@ void __init setup_arch(char **cmdline_p) ...@@ -265,7 +268,6 @@ void __init setup_arch(char **cmdline_p)
#ifdef CONFIG_DUMMY_CONSOLE #ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con; conswitchp = &dummy_con;
#endif #endif
boot_flags_init(*cmdline_p);
idprom_init(); idprom_init();
if (ARCH_SUN4C) if (ARCH_SUN4C)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册