summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-03 20:32:41 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-03 20:32:41 +0000
commita7b6796e7d8409ee00762c991ed76274df9ad38a (patch)
tree9b8872b9c6a2b013c6c3598eebff9fa8dbfa94c7
parent8e4391e8874deda13ed2dda79f184ddab00d5f47 (diff)
brcm47xx: add CONFIG_CMDLINE again
Fix for r19955 this patch was suggested by tripolar git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19967 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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