diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-03-01 06:56:43 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-03-04 14:02:37 -0500 |
commit | 36a885306fdf7bb557c773309c993bfb2d0d693c (patch) | |
tree | 643b246c90653c9451ff7fecff74a79c3de8042c /arch/mips/mips-boards/generic/init.c | |
parent | ca471c86043f4a8b01cba02ba2d3431fddcaf606 (diff) |
[MIPS] Fix and cleanup the mess that a dozen prom_printf variants are.
early_printk is a so much saner thing.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mips-boards/generic/init.c')
-rw-r--r-- | arch/mips/mips-boards/generic/init.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c index 58a0fe883591..b11337600129 100644 --- a/arch/mips/mips-boards/generic/init.c +++ b/arch/mips/mips-boards/generic/init.c | |||
@@ -167,7 +167,7 @@ static void __init console_config(void) | |||
167 | flow = 'r'; | 167 | flow = 'r'; |
168 | sprintf (console_string, " console=ttyS0,%d%c%c%c", baud, parity, bits, flow); | 168 | sprintf (console_string, " console=ttyS0,%d%c%c%c", baud, parity, bits, flow); |
169 | strcat (prom_getcmdline(), console_string); | 169 | strcat (prom_getcmdline(), console_string); |
170 | prom_printf("Config serial console:%s\n", console_string); | 170 | pr_info("Config serial console:%s\n", console_string); |
171 | } | 171 | } |
172 | } | 172 | } |
173 | #endif | 173 | #endif |
@@ -210,8 +210,9 @@ void __init kgdb_config (void) | |||
210 | generic_getDebugChar = rs_getDebugChar; | 210 | generic_getDebugChar = rs_getDebugChar; |
211 | } | 211 | } |
212 | 212 | ||
213 | prom_printf("KGDB: Using serial line /dev/ttyS%d at %d for session, " | 213 | pr_info("KGDB: Using serial line /dev/ttyS%d at %d for " |
214 | "please connect your debugger\n", line ? 1 : 0, speed); | 214 | "session, please connect your debugger\n", |
215 | line ? 1 : 0, speed); | ||
215 | 216 | ||
216 | { | 217 | { |
217 | char *s; | 218 | char *s; |
@@ -382,7 +383,7 @@ void __init prom_init(void) | |||
382 | board_nmi_handler_setup = mips_nmi_setup; | 383 | board_nmi_handler_setup = mips_nmi_setup; |
383 | board_ejtag_handler_setup = mips_ejtag_setup; | 384 | board_ejtag_handler_setup = mips_ejtag_setup; |
384 | 385 | ||
385 | prom_printf("\nLINUX started...\n"); | 386 | pr_info("\nLINUX started...\n"); |
386 | prom_init_cmdline(); | 387 | prom_init_cmdline(); |
387 | prom_meminit(); | 388 | prom_meminit(); |
388 | #ifdef CONFIG_SERIAL_8250_CONSOLE | 389 | #ifdef CONFIG_SERIAL_8250_CONSOLE |