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/cobalt | |
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/cobalt')
-rw-r--r-- | arch/mips/cobalt/console.c | 26 | ||||
-rw-r--r-- | arch/mips/cobalt/setup.c | 4 |
2 files changed, 0 insertions, 30 deletions
diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c index 46c23b66bc1..fff20d28114 100644 --- a/arch/mips/cobalt/console.c +++ b/arch/mips/cobalt/console.c | |||
@@ -19,29 +19,3 @@ static void putchar(int c) | |||
19 | 19 | ||
20 | COBALT_UART[UART_TX] = c; | 20 | COBALT_UART[UART_TX] = c; |
21 | } | 21 | } |
22 | |||
23 | static void cons_write(struct console *c, const char *s, unsigned n) | ||
24 | { | ||
25 | while(n-- && *s) | ||
26 | putchar(*s++); | ||
27 | } | ||
28 | |||
29 | static struct console cons_info = | ||
30 | { | ||
31 | .name = "uart", | ||
32 | .write = cons_write, | ||
33 | .flags = CON_PRINTBUFFER | CON_BOOT, | ||
34 | .index = -1, | ||
35 | }; | ||
36 | |||
37 | void __init cobalt_early_console(void) | ||
38 | { | ||
39 | register_console(&cons_info); | ||
40 | |||
41 | printk("Cobalt: early console registered\n"); | ||
42 | } | ||
43 | |||
44 | void __init disable_early_printk(void) | ||
45 | { | ||
46 | unregister_console(&cons_info); | ||
47 | } | ||
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c index 415ff8710b5..d2340587671 100644 --- a/arch/mips/cobalt/setup.c +++ b/arch/mips/cobalt/setup.c | |||
@@ -150,10 +150,6 @@ void __init plat_mem_setup(void) | |||
150 | #endif | 150 | #endif |
151 | 151 | ||
152 | if (cobalt_board_id > COBALT_BRD_ID_RAQ1) { | 152 | if (cobalt_board_id > COBALT_BRD_ID_RAQ1) { |
153 | #ifdef CONFIG_EARLY_PRINTK | ||
154 | cobalt_early_console(); | ||
155 | #endif | ||
156 | |||
157 | #ifdef CONFIG_SERIAL_8250 | 153 | #ifdef CONFIG_SERIAL_8250 |
158 | uart.line = 0; | 154 | uart.line = 0; |
159 | uart.type = PORT_UNKNOWN; | 155 | uart.type = PORT_UNKNOWN; |