upgrade iop32x to 2.6.24

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10440 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 18 insertions, 1 deletions

diff --git a/target/linux/iop32x/Makefile b/target/linux/iop32x/Makefile
index df84078a3b..8267625c97 100644
--- a/target/linux/iop32x/Makefile
+++ b/target/linux/iop32x/Makefile
@@ -11,7 +11,7 @@ BOARD:=iop32x
 BOARDNAME:=Intel XScale IOP32x
 FEATURES:=squashfs jffs2
 
-LINUX_VERSION:=2.6.21.5
+LINUX_VERSION:=2.6.24
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/iop32x/config-2.6.21 b/target/linux/iop32x/config-default
index 93c8198c65..f34335a404 100644
--- a/target/linux/iop32x/config-2.6.21
+++ b/target/linux/iop32x/config-default
@@ -26,6 +26,7 @@ CONFIG_ARCH_IOP32X=y
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_OMAP is not set
@@ -79,12 +80,14 @@ CONFIG_DLCI=m
 CONFIG_DLCI_COUNT=24
 CONFIG_DLCI_MAX=8
 # CONFIG_DM9000 is not set
+CONFIG_DMADEVICES=y
 CONFIG_DNOTIFY=y
 # CONFIG_DSCC4 is not set
 # CONFIG_E100 is not set
 CONFIG_E1000=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 CONFIG_E1000_NAPI=y
+# CONFIG_E1000E is not set
 # CONFIG_FARSYNC is not set
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FPE_FASTFPE is not set
@@ -139,7 +142,10 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_IEEE80211_SOFTMAC is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INTEL_IOP_ADMA=y
+# CONFIG_IOP_WATCHDOG is not set
 CONFIG_IOP3XX_ATU=y
+# CONFIG_IP1000 is not set
 # CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP6_NF_MATCH_EUI64 is not set
 # CONFIG_IP6_NF_MATCH_FRAG is not set
@@ -181,6 +187,7 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LIBCRC32C is not set
 # CONFIG_LLC2 is not set
 # CONFIG_MAC_PARTITION is not set
+# CONFIG_MACH_EM7210 is not set
 # CONFIG_MACH_GLANTANK is not set
 CONFIG_MACH_N2100=y
 # CONFIG_MINIX_FS is not set
@@ -239,6 +246,7 @@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
 CONFIG_NETDEV_1000=y
 # CONFIG_NET_CLS_ACT is not set
 # CONFIG_NET_CLS_IND is not set
+CONFIG_NET_DMA=y
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_SCH_NETEM is not set
@@ -303,14 +311,18 @@ CONFIG_R8169_VLAN=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set
 # CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=y
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_V3020 is not set
 CONFIG_RTC_DRV_X1205=y
@@ -344,6 +356,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SENSORS_ADM1029 is not set
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7470 is not set
 # CONFIG_SENSORS_ASB100 is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1337 is not set
@@ -351,10 +364,13 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S 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_I5K_AMB is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_LM75 is not set
@@ -435,6 +451,7 @@ CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_ZD1201 is not set
+# CONFIG_USER_NS is not set
 CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VIA_RHINE is not set
 CONFIG_VM_EVENT_COUNTERS=y