aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-11-30 09:08:21 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-11-30 09:08:21 +0000
commitcbe597e5cb3d85588b170949ad6ca832f5db1eee (patch)
treecbae66e7c7d5ce6a36c07f448b497dc36f1ef7de /target/linux
parent4f530fc049f1e2b3493a3e0d1e68a8d53d89c93a (diff)
downloadupstream-cbe597e5cb3d85588b170949ad6ca832f5db1eee.tar.gz
upstream-cbe597e5cb3d85588b170949ad6ca832f5db1eee.tar.bz2
upstream-cbe597e5cb3d85588b170949ad6ca832f5db1eee.zip
AA: [ar7] use a default kernel command-line to mount squashfs and jffs2
This fixes bug #9055. Backport of r34424. Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34428 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ar7/config-3.36
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar7/config-3.3 b/target/linux/ar7/config-3.3
index 8ff39e2c91..7646ba1458 100644
--- a/target/linux/ar7/config-3.3
+++ b/target/linux/ar7/config-3.3
@@ -7,10 +7,12 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_BCMA_POSSIBLE=y
CONFIG_BOOT_ELF32=y
CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
+CONFIG_CMDLINE="rootfstype=squashfs,jffs2"
+CONFIG_CMDLINE_BOOL=y
+# CONFIG_CMDLINE_OVERRIDE is not set
CONFIG_CPMAC=y
CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
@@ -75,7 +77,6 @@ CONFIG_MIPS=y
CONFIG_MIPS_L1_CACHE_SHIFT=5
# CONFIG_MIPS_MACHINE is not set
CONFIG_MIPS_MT_DISABLED=y
-CONFIG_MTD_AR7_PARTS=y
CONFIG_MTD_CFI_STAA=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MVSWITCH_PHY=y
@@ -98,5 +99,4 @@ CONFIG_SYS_SUPPORTS_ZBOOT=y
CONFIG_SYS_SUPPORTS_ZBOOT_UART16550=y
CONFIG_VLYNQ=y
# CONFIG_VLYNQ_DEBUG is not set
-CONFIG_XZ_DEC=y
CONFIG_ZONE_DMA_FLAG=0