diff options
Diffstat (limited to 'arch/mips/cobalt/setup.c')
-rw-r--r-- | arch/mips/cobalt/setup.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c index b9713a723053..4f9ea1210023 100644 --- a/arch/mips/cobalt/setup.c +++ b/arch/mips/cobalt/setup.c | |||
@@ -31,6 +31,7 @@ | |||
31 | extern void cobalt_machine_restart(char *command); | 31 | extern void cobalt_machine_restart(char *command); |
32 | extern void cobalt_machine_halt(void); | 32 | extern void cobalt_machine_halt(void); |
33 | extern void cobalt_machine_power_off(void); | 33 | extern void cobalt_machine_power_off(void); |
34 | extern void cobalt_early_console(void); | ||
34 | 35 | ||
35 | int cobalt_board_id; | 36 | int cobalt_board_id; |
36 | 37 | ||
@@ -109,14 +110,6 @@ void __init plat_setup(void) | |||
109 | /* I/O port resource must include UART and LCD/buttons */ | 110 | /* I/O port resource must include UART and LCD/buttons */ |
110 | ioport_resource.end = 0x0fffffff; | 111 | ioport_resource.end = 0x0fffffff; |
111 | 112 | ||
112 | /* | ||
113 | * This is a prom style console. We just poke at the | ||
114 | * UART to make it talk. | ||
115 | * Only use this console if you really screw up and can't | ||
116 | * get to the stage of setting up a real serial console. | ||
117 | */ | ||
118 | /*ns16550_setup_console();*/ | ||
119 | |||
120 | /* request I/O space for devices used on all i[345]86 PCs */ | 113 | /* request I/O space for devices used on all i[345]86 PCs */ |
121 | for (i = 0; i < COBALT_IO_RESOURCES; i++) | 114 | for (i = 0; i < COBALT_IO_RESOURCES; i++) |
122 | request_resource(&ioport_resource, cobalt_io_resources + i); | 115 | request_resource(&ioport_resource, cobalt_io_resources + i); |
@@ -136,6 +129,10 @@ void __init plat_setup(void) | |||
136 | #ifdef CONFIG_SERIAL_8250 | 129 | #ifdef CONFIG_SERIAL_8250 |
137 | if (cobalt_board_id > COBALT_BRD_ID_RAQ1) { | 130 | if (cobalt_board_id > COBALT_BRD_ID_RAQ1) { |
138 | 131 | ||
132 | #ifdef CONFIG_EARLY_PRINTK | ||
133 | cobalt_early_console(); | ||
134 | #endif | ||
135 | |||
139 | uart.line = 0; | 136 | uart.line = 0; |
140 | uart.type = PORT_UNKNOWN; | 137 | uart.type = PORT_UNKNOWN; |
141 | uart.uartclk = 18432000; | 138 | uart.uartclk = 18432000; |