From c35cd80f405e65a34c1b03d5d53911f227c75548 Mon Sep 17 00:00:00 2001 From: kaloz Date: Thu, 11 Feb 2010 08:30:12 +0000 Subject: [PATCH] [iop32x]: upgrade to 2.6.32.7, only build squashfs images by default git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19576 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/iop32x/Makefile | 6 +- target/linux/iop32x/config-default | 166 +++++++---------------------- 2 files changed, 40 insertions(+), 132 deletions(-) diff --git a/target/linux/iop32x/Makefile b/target/linux/iop32x/Makefile index 9bb89eee4..d5f419e6c 100644 --- a/target/linux/iop32x/Makefile +++ b/target/linux/iop32x/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=iop32x BOARDNAME:=Intel IOP32x -FEATURES:=squashfs jffs2 +FEATURES:=squashfs -LINUX_VERSION:=2.6.30.10 +LINUX_VERSION:=2.6.32.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/iop32x/config-default b/target/linux/iop32x/config-default index 96830ae7e..979a4051b 100644 --- a/target/linux/iop32x/config-default +++ b/target/linux/iop32x/config-default @@ -1,46 +1,34 @@ -# CONFIG_8139TOO is not set # CONFIG_AEABI is not set CONFIG_ALIGNMENT_TRAP=y -# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set -# CONFIG_ARCH_HAS_ILOG2_U32 is not set -# CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_ARCH_IOP32X=y # CONFIG_ARCH_IQ31244 is not set # CONFIG_ARCH_IQ80321 is not set -CONFIG_ARCH_SUPPORTS_AOUT=y +CONFIG_ARCH_REQUIRE_GPIOLIB=y +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # 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_ARTHUR is not set -CONFIG_ASYNC_CORE=y CONFIG_ATA=m -# CONFIG_ATMEL is not set -# CONFIG_ATM is not set -# CONFIG_BINFMT_AOUT is not set +# CONFIG_ATA_PIIX is not set CONFIG_BITREVERSE=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BONDING is not set -CONFIG_BOUNCE=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_CIFS_STATS is not set -CONFIG_CLASSIC_RCU=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_CACHE_VIVT=y -CONFIG_CPU_CP15_MMU=y CONFIG_CPU_CP15=y -# CONFIG_CPU_DCACHE_DISABLE is not set -CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_CP15_MMU=y +CONFIG_CPU_PABRT_LEGACY=y CONFIG_CPU_TLB_V4WBI=y CONFIG_CPU_XSCALE=y CONFIG_CRC16=y -# CONFIG_CRC_CCITT is not set # CONFIG_DEBUG_USER is not set +CONFIG_DECOMPRESS_LZMA=y CONFIG_DEVPORT=y CONFIG_DLCI=m CONFIG_DLCI_MAX=8 @@ -49,169 +37,89 @@ CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y CONFIG_DNOTIFY=y # CONFIG_DSCC4 is not set -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set -# CONFIG_E1000E_ENABLED is not set -CONFIG_E1000_NAPI=y CONFIG_E1000=y -# CONFIG_E100 is not set # CONFIG_FARSYNC is not set # CONFIG_FPE_FASTFPE is not set # CONFIG_FPE_NWFPE is not set CONFIG_FRAME_POINTER=y -CONFIG_FS_POSIX_ACL=y -# CONFIG_GENERIC_CLOCKEVENTS is not set -# CONFIG_GENERIC_FIND_FIRST_BIT is not set -# CONFIG_GENERIC_FIND_NEXT_BIT is not set -# CONFIG_GENERIC_GPIO is not set -# CONFIG_GENERIC_TIME is not set +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_GPIOLIB=y # CONFIG_HAMRADIO is not set CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y -# CONFIG_HAVE_DMA_ATTRS is not set +CONFIG_HAVE_AOUT=y +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_OPROFILE=y +CONFIG_HDLC=m CONFIG_HDLC_CISCO=m CONFIG_HDLC_FR=m -CONFIG_HDLC=m CONFIG_HDLC_PPP=m -# CONFIG_HDLC_RAW_ETH is not set CONFIG_HDLC_RAW=m -# CONFIG_HERMES is not set -# CONFIG_HWMON_DEBUG_CHIP is not set CONFIG_HWMON=y +# CONFIG_HWMON_DEBUG_CHIP is not set CONFIG_HW_RANDOM=y +CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y # CONFIG_I2C_IOP3XX is not set -CONFIG_I2C=y -# CONFIG_IDE is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_INTEL_IOP_ADMA=y # CONFIG_IOP_WATCHDOG 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 -# CONFIG_IP6_NF_MATCH_HL is not set -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_MATCH_OPTS is not set -# CONFIG_IP6_NF_MATCH_RT is not set -# CONFIG_IP6_NF_TARGET_LOG is not set # CONFIG_IP_ADVANCED_ROUTER is not set -CONFIG_IP_MROUTE=y -# CONFIG_IP_NF_ARPTABLES is not set -# CONFIG_IP_NF_MATCH_ADDRTYPE is not set -# CONFIG_IP_NF_MATCH_ECN is not set -# CONFIG_IP_NF_MATCH_RECENT is not set -# CONFIG_IP_NF_MATCH_TIME is not set -# CONFIG_IP_NF_SET is not set -# CONFIG_IP_NF_TARGET_ECN is not set -# CONFIG_IP_NF_TARGET_LOG is not set -# CONFIG_IP_NF_TARGET_NETMAP is not set -# CONFIG_IP_NF_TARGET_TTL is not set -# CONFIG_IP_NF_TARGET_ULOG is not set CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IWLWIFI_LEDS is not set # CONFIG_IWMMXT is not set -# CONFIG_LANMEDIA is not set -CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_LEDS_GPIO is not set CONFIG_LEGACY_PTYS=y -# CONFIG_LLC2 is not set -CONFIG_LZO_COMPRESS=m -CONFIG_LZO_DECOMPRESS=m +CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_MACH_EM7210 is not set # CONFIG_MACH_GLANTANK is not set CONFIG_MACH_N2100=y -# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set -CONFIG_MEDIA_TUNER=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -# CONFIG_MINIX_FS is not set # CONFIG_MTD_CFI_AMDSTD is not set CONFIG_MTD_REDBOOT_PARTS=y -# CONFIG_NE2K_PCI 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 -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_NLS_CODEPAGE_437 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_ISO8859_1 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NO_IDLE_HZ is not set -# CONFIG_NO_IOPORT is not set -# CONFIG_OABI_COMPAT is not set -# CONFIG_OCF_OCF is not set -# CONFIG_OUTER_CACHE is not set +CONFIG_NLS=m CONFIG_PAGEFLAGS_EXTENDED=y -# CONFIG_PC300 is not set -# CONFIG_PCI200SYN is not set -# CONFIG_PCIPCWATCHDOG is not set +CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PLAT_IOP=y -# CONFIG_PPP is not set -# CONFIG_PRISM54 is not set -# CONFIG_R6040 is not set -CONFIG_R8169_NAPI=y -CONFIG_R8169_VLAN=y CONFIG_R8169=y +CONFIG_R8169_VLAN=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_X1205=y +CONFIG_SCSI=m # CONFIG_SCSI_MULTI_LUN is not set -# CONFIG_SENSORS_PC87360 is not set # CONFIG_SERIAL_8250_EXTENDED is not set -CONFIG_SLABINFO=y -# CONFIG_SMC91X is not set 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_ACM is not set -# CONFIG_USB_CATC is not set -CONFIG_USB_EHCI_HCD=m -# CONFIG_USB_ISIGHTFW is not set -# CONFIG_USB_KAWETH is not set CONFIG_USB=m +CONFIG_USB_EHCI_HCD=m # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_HCD=m -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_PRINTER is not set -# CONFIG_USB_SERIAL is not set -# CONFIG_USB_STORAGE_ALAUDA is not set -# CONFIG_USB_STORAGE_DATAFAB is not set -# CONFIG_USB_STORAGE_DPCM is not set -# CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_JUMPSHOT is not set -# CONFIG_USB_STORAGE_KARMA is not set -# CONFIG_USB_STORAGE_SDDR09 is not set -# CONFIG_USB_STORAGE_SDDR55 is not set -# CONFIG_USB_STORAGE_USBAT is not set CONFIG_USB_SUPPORT=y CONFIG_USB_UHCI_HCD=m -# CONFIG_USB_USBNET is not set CONFIG_VECTORS_BASE=0xffff0000 -# CONFIG_VGASTATE is not set -# CONFIG_VIA_RHINE is not set -CONFIG_VIDEO_MEDIA=m CONFIG_VM_EVENT_COUNTERS=y -# CONFIG_WANXL is not set CONFIG_WAN=y -# CONFIG_XFS_FS is not set -# CONFIG_XIP_KERNEL is not set CONFIG_XSCALE_PMU=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZONE_DMA_FLAG=0