diff options
-rw-r--r-- | arch/mips/Kconfig | 2 | ||||
-rw-r--r-- | arch/mips/cobalt/Kconfig | 7 | ||||
-rw-r--r-- | arch/mips/cobalt/console.c | 5 |
3 files changed, 2 insertions, 12 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 4ec2dd5455f3..a1cd84f9b3bc 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -167,6 +167,7 @@ config MIPS_COBALT | |||
167 | select IRQ_CPU | 167 | select IRQ_CPU |
168 | select MIPS_GT64111 | 168 | select MIPS_GT64111 |
169 | select SYS_HAS_CPU_NEVADA | 169 | select SYS_HAS_CPU_NEVADA |
170 | select SYS_HAS_EARLY_PRINTK | ||
170 | select SYS_SUPPORTS_32BIT_KERNEL | 171 | select SYS_SUPPORTS_32BIT_KERNEL |
171 | select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL | 172 | select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL |
172 | select SYS_SUPPORTS_LITTLE_ENDIAN | 173 | select SYS_SUPPORTS_LITTLE_ENDIAN |
@@ -837,7 +838,6 @@ source "arch/mips/tx4927/Kconfig" | |||
837 | source "arch/mips/tx4938/Kconfig" | 838 | source "arch/mips/tx4938/Kconfig" |
838 | source "arch/mips/vr41xx/Kconfig" | 839 | source "arch/mips/vr41xx/Kconfig" |
839 | source "arch/mips/philips/pnx8550/common/Kconfig" | 840 | source "arch/mips/philips/pnx8550/common/Kconfig" |
840 | source "arch/mips/cobalt/Kconfig" | ||
841 | 841 | ||
842 | endmenu | 842 | endmenu |
843 | 843 | ||
diff --git a/arch/mips/cobalt/Kconfig b/arch/mips/cobalt/Kconfig deleted file mode 100644 index 7c42b088d16c..000000000000 --- a/arch/mips/cobalt/Kconfig +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | config EARLY_PRINTK | ||
2 | bool "Early console support" | ||
3 | depends on MIPS_COBALT | ||
4 | help | ||
5 | Provide early console support by direct access to the | ||
6 | on board UART. The UART must have been previously | ||
7 | initialised by the boot loader. | ||
diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c index fff20d28114f..ca56b415b8ac 100644 --- a/arch/mips/cobalt/console.c +++ b/arch/mips/cobalt/console.c | |||
@@ -9,11 +9,8 @@ | |||
9 | #include <asm/addrspace.h> | 9 | #include <asm/addrspace.h> |
10 | #include <asm/mach-cobalt/cobalt.h> | 10 | #include <asm/mach-cobalt/cobalt.h> |
11 | 11 | ||
12 | static void putchar(int c) | 12 | void prom_putchar(char c) |
13 | { | 13 | { |
14 | if(c == '\n') | ||
15 | putchar('\r'); | ||
16 | |||
17 | while(!(COBALT_UART[UART_LSR] & UART_LSR_THRE)) | 14 | while(!(COBALT_UART[UART_LSR] & UART_LSR_THRE)) |
18 | ; | 15 | ; |
19 | 16 | ||