diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2011-04-21 18:47:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-21 18:47:35 -0400 |
commit | 7671fa22af7a8a066663d93117c866672bd211c8 (patch) | |
tree | 8812343ad2b342897006f03f0530e884a00175ca /arch | |
parent | 9c2853af1fcbe01a123d666aa373e99119148ee6 (diff) |
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:
3c62a2d3477ff7725210db57aec3d2806fa10c20 ("[SPARC64]: Always register
a PROM based early console.")
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/kernel/devices.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/prom_32.c | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/setup_32.c | 14 |
3 files changed, 9 insertions, 8 deletions
diff --git a/arch/sparc/kernel/devices.c b/arch/sparc/kernel/devices.c index 12aff23beb94..113c052c3043 100644 --- a/arch/sparc/kernel/devices.c +++ b/arch/sparc/kernel/devices.c | |||
@@ -114,7 +114,7 @@ int cpu_get_hwmid(phandle prom_node) | |||
114 | 114 | ||
115 | void __init device_scan(void) | 115 | void __init device_scan(void) |
116 | { | 116 | { |
117 | prom_printf("Booting Linux...\n"); | 117 | printk(KERN_NOTICE "Booting Linux...\n"); |
118 | 118 | ||
119 | #ifndef CONFIG_SMP | 119 | #ifndef CONFIG_SMP |
120 | { | 120 | { |
diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c index 05fb25330583..5ce3d15a99b0 100644 --- a/arch/sparc/kernel/prom_32.c +++ b/arch/sparc/kernel/prom_32.c | |||
@@ -326,7 +326,6 @@ void __init of_console_init(void) | |||
326 | of_console_options = NULL; | 326 | of_console_options = NULL; |
327 | } | 327 | } |
328 | 328 | ||
329 | prom_printf(msg, of_console_path); | ||
330 | printk(msg, of_console_path); | 329 | printk(msg, of_console_path); |
331 | } | 330 | } |
332 | 331 | ||
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index 8f3031f6ecf7..ef8a2ed95161 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c | |||
@@ -109,10 +109,10 @@ prom_console_write(struct console *con, const char *s, unsigned n) | |||
109 | prom_write(s, n); | 109 | prom_write(s, n); |
110 | } | 110 | } |
111 | 111 | ||
112 | static struct console prom_debug_console = { | 112 | static struct console prom_early_console = { |
113 | .name = "debug", | 113 | .name = "earlyprom", |
114 | .write = prom_console_write, | 114 | .write = prom_console_write, |
115 | .flags = CON_PRINTBUFFER, | 115 | .flags = CON_PRINTBUFFER | CON_BOOT, |
116 | .index = -1, | 116 | .index = -1, |
117 | }; | 117 | }; |
118 | 118 | ||
@@ -133,8 +133,7 @@ static void __init process_switch(char c) | |||
133 | prom_halt(); | 133 | prom_halt(); |
134 | break; | 134 | break; |
135 | case 'p': | 135 | case 'p': |
136 | /* Use PROM debug console. */ | 136 | /* Just ignore, this behavior is now the default. */ |
137 | register_console(&prom_debug_console); | ||
138 | break; | 137 | break; |
139 | default: | 138 | default: |
140 | printk("Unknown boot switch (-%c)\n", c); | 139 | printk("Unknown boot switch (-%c)\n", c); |
@@ -215,6 +214,10 @@ void __init setup_arch(char **cmdline_p) | |||
215 | strcpy(boot_command_line, *cmdline_p); | 214 | strcpy(boot_command_line, *cmdline_p); |
216 | parse_early_param(); | 215 | parse_early_param(); |
217 | 216 | ||
217 | boot_flags_init(*cmdline_p); | ||
218 | |||
219 | register_console(&prom_early_console); | ||
220 | |||
218 | /* Set sparc_cpu_model */ | 221 | /* Set sparc_cpu_model */ |
219 | sparc_cpu_model = sun_unknown; | 222 | sparc_cpu_model = sun_unknown; |
220 | if (!strcmp(&cputypval[0], "sun4 ")) | 223 | if (!strcmp(&cputypval[0], "sun4 ")) |
@@ -265,7 +268,6 @@ void __init setup_arch(char **cmdline_p) | |||
265 | #ifdef CONFIG_DUMMY_CONSOLE | 268 | #ifdef CONFIG_DUMMY_CONSOLE |
266 | conswitchp = &dummy_con; | 269 | conswitchp = &dummy_con; |
267 | #endif | 270 | #endif |
268 | boot_flags_init(*cmdline_p); | ||
269 | 271 | ||
270 | idprom_init(); | 272 | idprom_init(); |
271 | if (ARCH_SUN4C) | 273 | if (ARCH_SUN4C) |