summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2009-06-02 19:05:28 +0100
committerRalf Baechle <ralf@linux-mips.org>2009-06-08 16:57:50 +0100
commite082f188f774544bc2c2edf51176157503c98fe4 (patch)
tree55046f4b2dcb1afee5a23b1bfb37537682c8b27f /arch
parente36b80b658d471be5a8a40f00e2c7614524b86a2 (diff)
downloadlinux-3.10-e082f188f774544bc2c2edf51176157503c98fe4.tar.gz
linux-3.10-e082f188f774544bc2c2edf51176157503c98fe4.tar.bz2
linux-3.10-e082f188f774544bc2c2edf51176157503c98fe4.zip
MIPS: Sibyte: Honor CONFIG_CMDLINE
Original patch by Imre Kaloz <kaloz@openwrt.org>. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/sibyte/cfe/setup.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c
index 3de30f79db3..eb5396cf81b 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.");