aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-08-14 21:07:36 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-08-14 21:07:36 +0000
commit2f8079e04449719382f00ac22ed2b64df1a6c304 (patch)
tree178e46c57440c754ae15bb7777259e24b6371eee /target/linux/ixp4xx
parent8fce7537f911c3d807d56bf971f306373dbcd88e (diff)
downloadupstream-2f8079e04449719382f00ac22ed2b64df1a6c304.tar.gz
upstream-2f8079e04449719382f00ac22ed2b64df1a6c304.tar.bz2
upstream-2f8079e04449719382f00ac22ed2b64df1a6c304.zip
ixp4xx: sync 2.6.32 kernel config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22646 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/config-2.6.3229
1 files changed, 18 insertions, 11 deletions
diff --git a/target/linux/ixp4xx/config-2.6.32 b/target/linux/ixp4xx/config-2.6.32
index 997768632c..aca804c1a6 100644
--- a/target/linux/ixp4xx/config-2.6.32
+++ b/target/linux/ixp4xx/config-2.6.32
@@ -12,24 +12,26 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ARM_THUMB is not set
CONFIG_ARM=y
+CONFIG_ARM_L1_CACHE_SHIFT=5
+# CONFIG_ARM_THUMB is not set
# CONFIG_ARPD is not set
CONFIG_BITREVERSE=y
CONFIG_BOUNCE=y
+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CPU_32v5=y
CONFIG_CPU_32=y
+CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_BIG_ENDIAN=y
CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_CP15_MMU=y
CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
CONFIG_CPU_ENDIAN_BE32=y
# CONFIG_CPU_ENDIAN_BE8 is not set
CONFIG_CPU_IXP43X=y
CONFIG_CPU_IXP46X=y
-CONFIG_CPU_PABRT_NOIFAR=y
+CONFIG_CPU_PABRT_LEGACY=y
CONFIG_CPU_TLB_V4WBI=y
CONFIG_CPU_XSCALE=y
# CONFIG_DEBUG_USER is not set
@@ -42,14 +44,14 @@ CONFIG_EEPROM_AT24=y
# CONFIG_FPE_FASTFPE is not set
# CONFIG_FPE_NWFPE is not set
CONFIG_FRAME_POINTER=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_GENERIC_GPIO=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_GPIOLIB=y
CONFIG_GPIO_DEVICE=y
CONFIG_GPIO_GW_I2C_PLD=y
-CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HAMRADIO is not set
CONFIG_HARDIRQS_SW_RESEND=y
@@ -61,22 +63,25 @@ CONFIG_HAVE_ARCH_KGDB=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_HAVE_IDE=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MTD_OTP=y
CONFIG_HAVE_OPROFILE=y
+CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
CONFIG_HWMON_VID=y
-CONFIG_HWMON=y
-CONFIG_HW_RANDOM_IXP4XX=y
CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_IXP4XX=y
+CONFIG_I2C=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_GPIO=y
# CONFIG_I2C_IOP3XX is not set
-CONFIG_I2C=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
@@ -90,8 +95,8 @@ CONFIG_IXP4XX_WATCHDOG=y
CONFIG_LEDS_FSG=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_LATCH=y
-CONFIG_LEGACY_PTY_COUNT=256
CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
CONFIG_MACH_AP1000=y
CONFIG_MACH_AVILA=y
CONFIG_MACH_CAMBRIA=y
@@ -108,8 +113,8 @@ CONFIG_MACH_LOFT=y
CONFIG_MACH_MI424WR=y
CONFIG_MACH_NAS100D=y
CONFIG_MACH_NSLU2=y
-CONFIG_MACH_PRONGHORNMETRO=y
CONFIG_MACH_PRONGHORN=y
+CONFIG_MACH_PRONGHORNMETRO=y
CONFIG_MACH_SIDEWINDER=y
CONFIG_MACH_TW5334=y
CONFIG_MACH_USR8200=y
@@ -139,6 +144,8 @@ CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SPLIT_PTLOCK_CPUS=4096
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+CONFIG_TREE_RCU=y
CONFIG_UID16=y
CONFIG_USB_SUPPORT=y
CONFIG_VECTORS_BASE=0xffff0000