diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2009-06-02 20:05:28 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2009-06-08 17:57:50 +0200 |
| commit | e082f188f774544bc2c2edf51176157503c98fe4 (patch) | |
| tree | 55046f4b2dcb1afee5a23b1bfb37537682c8b27f | |
| parent | SSB: BCM47xx: Export ssb_watchdog_timer_set (diff) | |
| download | linux-e082f188f774544bc2c2edf51176157503c98fe4.tar.xz linux-e082f188f774544bc2c2edf51176157503c98fe4.zip | |
MIPS: Sibyte: Honor CONFIG_CMDLINE
Original patch by Imre Kaloz <kaloz@openwrt.org>.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/sibyte/cfe/setup.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c index 3de30f79db3f..eb5396cf81bb 100644 --- a/arch/mips/sibyte/cfe/setup.c +++ b/arch/mips/sibyte/cfe/setup.c @@ -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."); |