[PATCH][MIPS] fix Cobalt early printk

[PATCH][MIPS] fix Cobalt early printk

[Yoichi Yuasa]

Hi Ralf,

This patch has fixed Cobalt early printk.

Yoichi

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/Kconfig mips/arch/mips/Kconfig
--- mips-orig/arch/mips/Kconfig	2007-03-02 10:51:23.580547750 +0900
+++ mips/arch/mips/Kconfig	2007-03-02 12:35:15.292826000 +0900
@@ -167,6 +167,7 @@ config MIPS_COBALT
 	select IRQ_CPU
 	select MIPS_GT64111
 	select SYS_HAS_CPU_NEVADA
+	select SYS_HAS_EARLY_PRINTK
 	select SYS_SUPPORTS_32BIT_KERNEL
 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 	select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -837,7 +838,6 @@ source "arch/mips/tx4927/Kconfig"
 source "arch/mips/tx4938/Kconfig"
 source "arch/mips/vr41xx/Kconfig"
 source "arch/mips/philips/pnx8550/common/Kconfig"
-source "arch/mips/cobalt/Kconfig"
 
 endmenu
 
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/Kconfig mips/arch/mips/cobalt/Kconfig
--- mips-orig/arch/mips/cobalt/Kconfig	2007-03-02 10:51:24.048577000 +0900
+++ mips/arch/mips/cobalt/Kconfig	1970-01-01 09:00:00.000000000 +0900
@@ -1,7 +0,0 @@
-config EARLY_PRINTK
-	bool "Early console support"
-	depends on MIPS_COBALT
-	help
-	  Provide early console support by direct access to the
-	  on board UART. The UART must have been previously
-	  initialised by the boot loader.
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/console.c mips/arch/mips/cobalt/console.c
--- mips-orig/arch/mips/cobalt/console.c	2007-03-02 10:51:24.068578250 +0900
+++ mips/arch/mips/cobalt/console.c	2007-03-02 11:27:01.184311000 +0900
@@ -9,11 +9,8 @@
 #include <asm/addrspace.h>
 #include <asm/mach-cobalt/cobalt.h>
 
-static void putchar(int c)
+void prom_putchar(char c)
 {
-	if(c == '\n')
-		putchar('\r');
-
 	while(!(COBALT_UART[UART_LSR] & UART_LSR_THRE))
 		;
 

Re: [PATCH][MIPS] fix Cobalt early printk

[Ralf Baechle]

On Fri, Mar 02, 2007 at 12:42:33PM +0900, Yoichi Yuasa wrote:

> This patch has fixed Cobalt early printk.

Applied.  Thanks,

  Ralf

Re: [PATCH][MIPS] fix Cobalt early printk

[Yoichi Yuasa]

Hi Ralf,

On Fri, 2 Mar 2007 13:36:44 +0000
Ralf Baechle <ralf@linux-mips.org> wrote:

> On Fri, Mar 02, 2007 at 12:42:33PM +0900, Yoichi Yuasa wrote:
> 
> > This patch has fixed Cobalt early printk.
> 
> Applied.  Thanks,

It's only applied to 2.6.20-stable.
Please apply to master too.

Yoichi

Re: [PATCH][MIPS] fix Cobalt early printk

[Ralf Baechle]

On Mon, Mar 05, 2007 at 05:48:51AM +0900, Yoichi Yuasa wrote:

> On Fri, 2 Mar 2007 13:36:44 +0000
> Ralf Baechle <ralf@linux-mips.org> wrote:
> 
> > On Fri, Mar 02, 2007 at 12:42:33PM +0900, Yoichi Yuasa wrote:
> > 
> > > This patch has fixed Cobalt early printk.
> > 
> > Applied.  Thanks,
> 
> It's only applied to 2.6.20-stable.
> Please apply to master too.

Indeed.  Worse, the patch happened to apply cleanly on 2.6.20-stable but
doesn't work there so I reverted it on 2.6.20 and applied it on master.

Thanks,

  Ralf