From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 3 Mar 2010 20:32:41 +0000 (+0000)
Subject: brcm47xx: add CONFIG_CMDLINE again
X-Git-Tag: reboot~20842
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d29c671202812df83691795f28c3fa12c5a0b7a7;p=oweals%2Fopenwrt.git

brcm47xx: add CONFIG_CMDLINE again

Fix for r19955
this patch was suggested by tripolar

SVN-Revision: 19967
---

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