MIPS: Sibyte: Honor CONFIG_CMDLINE
authorRalf Baechle <ralf@linux-mips.org>
Tue, 2 Jun 2009 18:05:28 +0000 (19:05 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 8 Jun 2009 15:57:50 +0000 (16:57 +0100)
Original patch by Imre Kaloz <kaloz@openwrt.org>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/sibyte/cfe/setup.c

index 3de30f7..eb5396c 100644 (file)
@@ -288,13 +288,7 @@ void __init prom_init(void)
         */
        cfe_cons_handle = cfe_getstdhandle(CFE_STDHANDLE_CONSOLE);
        if (cfe_getenv("LINUX_CMDLINE", arcs_cmdline, CL_SIZE) < 0) {
-               if (argc < 0) {
-                       /*
-                        * It's OK for direct boot to not provide a
-                        *  command line
-                        */
-                       strcpy(arcs_cmdline, "root=/dev/ram0 ");
-               } else {
+               if (argc >= 0) {
                        /* The loader should have set the command line */
                        /* too early for panic to do any good */
                        printk("LINUX_CMDLINE not defined in cfe.");