MIPS: Alchemy: move commandline mangling out of common code

Not every alchemy-based board might want these options forced on it,
and most of this stuff seems to be intended for devboard code anyway.
Remove commandline mangling code out of common chip code and instead
add relevant sections to all in-tree boards to not change existing
behaviour.

Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 4 insertions, 30 deletions

diff --git a/arch/mips/alchemy/common/setup.c b/arch/mips/alchemy/common/setup.c
index 1ac6b06f42a3..9889ec3ba4c4 100644
--- a/arch/mips/alchemy/common/setup.c
+++ b/arch/mips/alchemy/common/setup.c
@@ -35,7 +35,6 @@
 #include <asm/time.h>
 
 #include <au1000.h>
-#include <prom.h>
 
 extern void __init board_setup(void);
 extern void au1000_restart(char *);
@@ -46,12 +45,15 @@ extern void set_cpuspec(void);
 void __init plat_mem_setup(void)
 {
         struct  cpu_spec *sp;
-        char *argptr;
         unsigned long prid, cpufreq, bclk;
 
         set_cpuspec();
         sp = cur_cpu_spec[0];
 
+        _machine_restart = au1000_restart;
+        _machine_halt = au1000_halt;
+        pm_power_off = au1000_power_off;
+
         board_setup();  /* board specific setup */
 
         prid = read_c0_prid();
@@ -79,34 +81,6 @@ void __init plat_mem_setup(void)
                 /* Clear to obtain best system bus performance */
                 clear_c0_config(1 << 19); /* Clear Config[OD] */
 
-        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
-        _machine_restart = au1000_restart;
-        _machine_halt = au1000_halt;
-        pm_power_off = au1000_power_off;
-
         /* IO/MEM resources. */
         set_io_port_base(0);
         ioport_resource.start = IOPORT_RESOURCE_START;