8 files changed, 0 insertions, 120 deletions

diff --git a/arch/mips/alchemy/devboards/db1x00/board_setup.c b/arch/mips/alchemy/devboards/db1x00/board_setup.c
index 56c541d0c55a..559d9b256db7 100644
--- a/arch/mips/alchemy/devboards/db1x00/board_setup.c
+++ b/arch/mips/alchemy/devboards/db1x00/board_setup.c
@@ -125,7 +125,6 @@ void __init board_setup(void)
 {
         unsigned long bcsr1, bcsr2;
         u32 pin_func;
-        char *argptr;
 
         bcsr1 = DB1000_BCSR_PHYS_ADDR;
         bcsr2 = DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS;
@@ -159,30 +158,6 @@ void __init board_setup(void)
         /* initialize board register space */
         bcsr_init(bcsr1, bcsr2);
 
-        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_AU1100
-        argptr = strstr(argptr, "video=");
-        if (argptr == NULL) {
-                argptr = prom_getcmdline();
-                /* default panel */
-                /*strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");*/
-        }
-#endif
-
-#if defined(CONFIG_SOUND_AU1X00) && !defined(CONFIG_SOC_AU1000)
-        /* au1000 does not support vra, au1500 and au1100 do */
-        strcat(argptr, " au1000_audio=vra");
-        argptr = prom_getcmdline();
-#endif
-
         /* Not valid for Au1550 */
 #if defined(CONFIG_IRDA) && \
    (defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1100))
diff --git a/arch/mips/alchemy/devboards/pb1000/board_setup.c b/arch/mips/alchemy/devboards/pb1000/board_setup.c
index 28b8bd278a16..b5311d8a29ab 100644
--- a/arch/mips/alchemy/devboards/pb1000/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1000/board_setup.c
@@ -47,19 +47,9 @@ void __init board_setup(void)
         u32 pin_func, static_cfg0;
         u32 sys_freqctrl, sys_clksrc;
         u32 prid = read_c0_prid();
-        char *argptr;
 
         sys_freqctrl = 0;
         sys_clksrc = 0;
-        argptr = prom_getcmdline();
-
-#ifdef CONFIG_SERIAL_8250_CONSOLE
-        argptr = strstr(argptr, "console=");
-        if (argptr == NULL) {
-                argptr = prom_getcmdline();
-                strcat(argptr, " console=ttyS0,115200");
-        }
-#endif
 
         /* Set AUX clock to 12 MHz * 8 = 96 MHz */
         au_writel(8, SYS_AUXPLL);
diff --git a/arch/mips/alchemy/devboards/pb1100/board_setup.c b/arch/mips/alchemy/devboards/pb1100/board_setup.c
index e0bd855f899b..c7b4caa81a35 100644
--- a/arch/mips/alchemy/devboards/pb1100/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1100/board_setup.c
@@ -47,35 +47,10 @@ void board_reset(void)
 void __init board_setup(void)
 {
         volatile void __iomem *base = (volatile void __iomem *)0xac000000UL;
-        char *argptr;
 
         bcsr_init(DB1000_BCSR_PHYS_ADDR,
                   DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS);
 
-        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_AU1100
-        argptr = strstr(argptr, "video=");
-        if (argptr == NULL) {
-                argptr = prom_getcmdline();
-                /* default panel */
-                /*strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");*/
-        }
-#endif
-
-#if defined(CONFIG_SOUND_AU1X00) && !defined(CONFIG_SOC_AU1000)
-        /* au1000 does not support vra, au1500 and au1100 do */
-        strcat(argptr, " au1000_audio=vra");
-        argptr = prom_getcmdline();
-#endif
-
         /* Set AUX clock to 12 MHz * 8 = 96 MHz */
         au_writel(8, SYS_AUXPLL);
         alchemy_gpio1_input_enable();
diff --git a/arch/mips/alchemy/devboards/pb1200/board_setup.c b/arch/mips/alchemy/devboards/pb1200/board_setup.c
index 2cf59e728247..3184063f8042 100644
--- a/arch/mips/alchemy/devboards/pb1200/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1200/board_setup.c
@@ -56,24 +56,10 @@ void board_reset(void)
 
 void __init board_setup(void)
 {
-        char *argptr;
-
         printk(KERN_INFO "AMD Alchemy Pb1200 Board\n");
         bcsr_init(PB1200_BCSR_PHYS_ADDR,
                   PB1200_BCSR_PHYS_ADDR + PB1200_BCSR_HEXLED_OFS);
 
-        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
         {
                 u32 pin_func;
diff --git a/arch/mips/alchemy/devboards/pb1500/board_setup.c b/arch/mips/alchemy/devboards/pb1500/board_setup.c
index 3f0c92cb35bd..fa9770ac358a 100644
--- a/arch/mips/alchemy/devboards/pb1500/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1500/board_setup.c
@@ -54,26 +54,10 @@ void __init board_setup(void)
 {
         u32 pin_func;
         u32 sys_freqctrl, sys_clksrc;
-        char *argptr;
 
         bcsr_init(DB1000_BCSR_PHYS_ADDR,
                   DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS);
 
-        argptr = prom_getcmdline();
-#ifdef CONFIG_SERIAL_8250_CONSOLE
-        argptr = strstr(argptr, "console=");
-        if (argptr == NULL) {
-                argptr = prom_getcmdline();
-                strcat(argptr, " console=ttyS0,115200");
-        }
-#endif
-
-#if defined(CONFIG_SOUND_AU1X00) && !defined(CONFIG_SOC_AU1000)
-        /* au1000 does not support vra, au1500 and au1100 do */
-        strcat(argptr, " au1000_audio=vra");
-        argptr = prom_getcmdline();
-#endif
-
         sys_clksrc = sys_freqctrl = pin_func = 0;
         /* Set AUX clock to 12 MHz * 8 = 96 MHz */
         au_writel(8, SYS_AUXPLL);
diff --git a/arch/mips/alchemy/devboards/pb1550/board_setup.c b/arch/mips/alchemy/devboards/pb1550/board_setup.c
index 0d060c3dd6f8..1e8fb3ddd726 100644
--- a/arch/mips/alchemy/devboards/pb1550/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1550/board_setup.c
@@ -56,20 +56,10 @@ void board_reset(void)
 void __init board_setup(void)
 {
         u32 pin_func;
-        char *argptr;
 
         bcsr_init(PB1550_BCSR_PHYS_ADDR,
                   PB1550_BCSR_PHYS_ADDR + PB1550_BCSR_HEXLED_OFS);
 
-        argptr = prom_getcmdline();
-#ifdef CONFIG_SERIAL_8250_CONSOLE
-        argptr = strstr(argptr, "console=");
-        if (argptr == NULL) {
-                argptr = prom_getcmdline();
-                strcat(argptr, " console=ttyS0,115200");
-        }
-#endif
-
         alchemy_gpio2_enable();
 
         /*
diff --git a/arch/mips/alchemy/mtx-1/board_setup.c b/arch/mips/alchemy/mtx-1/board_setup.c
index e2838c6185d3..a9f0336e1f1f 100644
--- a/arch/mips/alchemy/mtx-1/board_setup.c
+++ b/arch/mips/alchemy/mtx-1/board_setup.c
@@ -67,16 +67,6 @@ static void mtx1_power_off(void)
 
 void __init board_setup(void)
 {
-#ifdef CONFIG_SERIAL_8250_CONSOLE
-        char *argptr;
-        argptr = prom_getcmdline();
-        argptr = strstr(argptr, "console=");
-        if (argptr == NULL) {
-                argptr = prom_getcmdline();
-                strcat(argptr, " console=ttyS0,115200");
-        }
-#endif
-
         alchemy_gpio2_enable();
 
 #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
diff --git a/arch/mips/alchemy/xxs1500/board_setup.c b/arch/mips/alchemy/xxs1500/board_setup.c
index 7956afa78c4b..47b42927607b 100644
--- a/arch/mips/alchemy/xxs1500/board_setup.c
+++ b/arch/mips/alchemy/xxs1500/board_setup.c
@@ -51,16 +51,6 @@ void __init board_setup(void)
 {
         u32 pin_func;
 
-#ifdef CONFIG_SERIAL_8250_CONSOLE
-        char *argptr;
-        argptr = prom_getcmdline();
-        argptr = strstr(argptr, "console=");
-        if (argptr == NULL) {
-                argptr = prom_getcmdline();
-                strcat(argptr, " console=ttyS0,115200");
-        }
-#endif
-
         pm_power_off = xxs1500_power_off;
         _machine_halt = xxs1500_power_off;
         _machine_restart = xxs1500_reset;