aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-03-03 20:32:41 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-03-03 20:32:41 +0000
commitd29c671202812df83691795f28c3fa12c5a0b7a7 (patch)
tree724034c2dac66bf5104242b2e28127ea1bdaadc3
parentc38f612532ad61882a10b76cad78108240cb5abb (diff)
downloadupstream-d29c671202812df83691795f28c3fa12c5a0b7a7.tar.gz
upstream-d29c671202812df83691795f28c3fa12c5a0b7a7.tar.bz2
upstream-d29c671202812df83691795f28c3fa12c5a0b7a7.zip
brcm47xx: add CONFIG_CMDLINE again
Fix for r19955 this patch was suggested by tripolar SVN-Revision: 19967
-rw-r--r--target/linux/brcm47xx/config-2.6.333
-rw-r--r--target/linux/generic-2.6/config-2.6.331
2 files changed, 3 insertions, 1 deletions
diff --git a/target/linux/brcm47xx/config-2.6.33 b/target/linux/brcm47xx/config-2.6.33
index 63749ae388..2c3a23fa8c 100644
--- a/target/linux/brcm47xx/config-2.6.33
+++ b/target/linux/brcm47xx/config-2.6.33
@@ -24,6 +24,9 @@ CONFIG_BITREVERSE=y
CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
CONFIG_CFE=y
+CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
+CONFIG_CMDLINE_BOOL=y
+# CONFIG_CMDLINE_OVERRIDE is not set
# CONFIG_CPU_BIG_ENDIAN is not set
# CONFIG_CPU_CAVIUM_OCTEON is not set
CONFIG_CPU_HAS_PREFETCH=y
diff --git a/target/linux/generic-2.6/config-2.6.33 b/target/linux/generic-2.6/config-2.6.33
index 283ad01434..443319b8b4 100644
--- a/target/linux/generic-2.6/config-2.6.33
+++ b/target/linux/generic-2.6/config-2.6.33
@@ -1105,7 +1105,6 @@ CONFIG_KERNEL_LZMA=y
# CONFIG_KEYBOARD_OPENCORES is not set
# CONFIG_KEYS is not set
# CONFIG_KGDB is not set
-# CONFIG_CMDLINE_BOOL is not set
# CONFIG_KMEMTRACE is not set
CONFIG_KMOD=y
# CONFIG_KPROBES is not set