summaryrefslogtreecommitdiff
path: root/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-collie
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2005-12-05 16:04:29 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-12-05 16:04:29 +0000
commit2844ab7cfd1f279fd8d117223205fdd21f619059 (patch)
tree41efa3b7ebf35fae3d70e70fac46a59cb7da358a /packages/linux/linux-openzaurus-2.6.14-git3/defconfig-collie
parentec3bff608d703cd39e2db1d6d747a063385cbe0a (diff)
linux-oz-2.6: Add dyntick option to linux-openzaurus.inc. Update defconfigs to hopefully solve space issues on -git3 kernels and remove second CMDLINE option from the defconfigs as this breaks on recent kernel kconfig changes.
Diffstat (limited to 'packages/linux/linux-openzaurus-2.6.14-git3/defconfig-collie')
-rw-r--r--packages/linux/linux-openzaurus-2.6.14-git3/defconfig-collie46
1 files changed, 6 insertions, 40 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-collie b/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-collie
index 5dbd118cf1..cbe06f9c3a 100644
--- a/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-collie
+++ b/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-collie
@@ -153,7 +153,7 @@ CONFIG_PCMCIA_SA1100=y
#
# CONFIG_SMP is not set
CONFIG_PREEMPT=y
-# CONFIG_NO_IDLE_HZ is not set
+CONFIG_NO_IDLE_HZ=y
CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_FLATMEM_MANUAL is not set
@@ -172,7 +172,6 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 mem=32M debug"
# CONFIG_XIP_KERNEL is not set
#
@@ -381,8 +380,8 @@ CONFIG_BLK_DEV_INITRD=y
#
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_DEADLINE is not set
# CONFIG_DEFAULT_CFQ is not set
@@ -511,7 +510,7 @@ CONFIG_PPP=m
# CONFIG_PPP_FILTER is not set
CONFIG_PPP_ASYNC=m
# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPP_DEFLATE is not set
+CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set
@@ -661,41 +660,7 @@ CONFIG_I2C_ALGOBIT=m
#
# Hardware Monitoring support
#
-CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_HWMON is not set
#
# Misc devices
@@ -893,6 +858,7 @@ CONFIG_JFFS2_FS_WRITEBUFFER=y
# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
CONFIG_JFFS2_ZLIB=y
CONFIG_JFFS2_RTIME=y
+CONFIG_JFFS2_SUMMARY=y
# CONFIG_JFFS2_RUBIN is not set
CONFIG_CRAMFS=y
# CONFIG_VXFS_FS is not set