1 files changed, 13 insertions, 11 deletions

diff --git a/arch/mips/alchemy/devboards/pb1200/board_setup.c b/arch/mips/alchemy/devboards/pb1200/board_setup.c
index 8f03dc8fdd2..b5585e46200 100644
--- a/arch/mips/alchemy/devboards/pb1200/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1200/board_setup.c
@@ -46,7 +46,19 @@ void board_reset(void)
 
 void __init board_setup(void)
 {
-        char *argptr = NULL;
+        char *argptr;
+
+        argptr = prom_getcmdline();
+#ifdef CONFIG_SERIAL_8250_CONSOLE
+        argptr = strstr(argptr, "console=");
+        if (argptr == NULL) {
+                argptr = prom_getcmdline();
+                strcat(argptr, " console=ttyS0,115200");
+        }
+#endif
+#ifdef CONFIG_FB_AU1200
+        strcat(argptr, " video=au1200fb:panel:bs");
+#endif
 
 #if 0
         {
@@ -104,16 +116,6 @@ void __init board_setup(void)
         }
 #endif
 
-#ifdef CONFIG_FB_AU1200
-        argptr = prom_getcmdline();
-#ifdef CONFIG_MIPS_PB1200
-        strcat(argptr, " video=au1200fb:panel:bs");
-#endif
-#ifdef CONFIG_MIPS_DB1200
-        strcat(argptr, " video=au1200fb:panel:bs");
-#endif
-#endif
-
         /*
          * The Pb1200 development board uses external MUX for PSC0 to
          * support SMB/SPI. bcsr->resets bit 12: 0=SMB 1=SPI