From: Felix Fietkau Date: Sat, 26 Feb 2011 06:23:18 +0000 (+0000) Subject: ixp4xx: recreate the 2.6.37 config from the 2.6.32 one to clean up several faulty... X-Git-Tag: reboot~17439 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=13556da59a1bc11afb4eac2fcc14b81acfe0c103;p=openwrt%2Fstaging%2Fxback.git ixp4xx: recreate the 2.6.37 config from the 2.6.32 one to clean up several faulty overrides SVN-Revision: 25724 --- diff --git a/target/linux/ixp4xx/config-2.6.37 b/target/linux/ixp4xx/config-2.6.37 index 515830aa95..0aa8158c6b 100644 --- a/target/linux/ixp4xx/config-2.6.37 +++ b/target/linux/ixp4xx/config-2.6.37 @@ -1,6 +1,7 @@ # CONFIG_AEABI is not set CONFIG_ALIGNMENT_TRAP=y # CONFIG_ARCH_ADI_COYOTE is not set +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_ARCH_IXCDP1100=y CONFIG_ARCH_IXDP425=y CONFIG_ARCH_IXDP4XX=y @@ -17,15 +18,9 @@ CONFIG_ARM=y CONFIG_ARM_L1_CACHE_SHIFT=5 # CONFIG_ARM_THUMB is not set # CONFIG_ARPD is not set -CONFIG_ATA=y -CONFIG_BITREVERSE=y -CONFIG_BLK_DEV_SD=y -# CONFIG_BMP085 is not set +CONFIG_BKL=y CONFIG_BOUNCE=y -# CONFIG_BSD_PROCESS_ACCT is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200" -CONFIG_COMPAT_BRK=y CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y CONFIG_CPU_BIG_ENDIAN=y @@ -40,19 +35,12 @@ CONFIG_CPU_IXP46X=y CONFIG_CPU_PABRT_LEGACY=y CONFIG_CPU_TLB_V4WBI=y CONFIG_CPU_XSCALE=y -CONFIG_CRYPTO_PCOMP2=y CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_USER is not set CONFIG_DECOMPRESS_LZMA=y -CONFIG_DEVPORT=y -# CONFIG_DM9000 is not set CONFIG_DMABOUNCE=y CONFIG_DNOTIFY=y CONFIG_EEPROM_AT24=y -# CONFIG_FANOTIFY is not set -# CONFIG_FIREWIRE_NOSY is not set -CONFIG_FORCE_MAX_ZONEORDER=11 # CONFIG_FPE_FASTFPE is not set # CONFIG_FPE_NWFPE is not set CONFIG_FRAME_POINTER=y @@ -65,24 +53,24 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_GPIOLIB=y CONFIG_GPIO_DEVICE=y CONFIG_GPIO_GW_I2C_PLD=y -# CONFIG_GPIO_SX150X is not set CONFIG_GPIO_SYSFS=y # CONFIG_HAMRADIO is not set CONFIG_HARDIRQS_SW_RESEND=y -# CONFIG_HARDLOCKUP_DETECTOR is not set CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAVE_AOUT=y CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y +# CONFIG_HAVE_GENERIC_HARDIRQS is not set CONFIG_HAVE_IDE=y +CONFIG_HAVE_IRQ_WORK=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_MEMBLOCK=y CONFIG_HAVE_MTD_OTP=y @@ -90,7 +78,6 @@ CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_HAVE_PROC_CPU=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -# CONFIG_HMC6352 is not set CONFIG_HWMON=y # CONFIG_HWMON_DEBUG_CHIP is not set CONFIG_HWMON_VID=y @@ -102,15 +89,12 @@ CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_GPIO=y # CONFIG_I2C_IOP3XX is not set -# CONFIG_I2C_MUX is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -# CONFIG_ISDN is not set # CONFIG_IWMMXT is not set CONFIG_IXP4XX_ETH=y # CONFIG_IXP4XX_INDIRECT_PCI is not set -CONFIG_IXP4XX_LEGACY_DMABOUNCE=y CONFIG_IXP4XX_NPE=y CONFIG_IXP4XX_QMGR=y CONFIG_IXP4XX_WATCHDOG=y @@ -135,6 +119,7 @@ CONFIG_MACH_IXDPG425=y CONFIG_MACH_LOFT=y CONFIG_MACH_MI424WR=y CONFIG_MACH_NAS100D=y +CONFIG_MACH_NO_WESTBRIDGE=y CONFIG_MACH_NSLU2=y CONFIG_MACH_PRONGHORN=y CONFIG_MACH_PRONGHORNMETRO=y @@ -145,59 +130,38 @@ CONFIG_MACH_USR8200=y CONFIG_MACH_WG302V1=y CONFIG_MACH_WG302V2=y CONFIG_MACH_WRT300NV2=y -# CONFIG_MFD_MAX8998 is not set -# CONFIG_MFD_STMPE is not set -# CONFIG_MFD_TPS6586X is not set CONFIG_MTD_CFI_ADV_OPTIONS=y # CONFIG_MTD_CFI_GEOMETRY is not set CONFIG_MTD_IXP4XX=y CONFIG_MTD_OTP=y CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MVSWITCH_PHY=y CONFIG_NEED_DMA_MAP_STATE=y -# CONFIG_NETWORK_PHY_TIMESTAMPING is not set -CONFIG_NO_HZ=y +CONFIG_NEED_PER_CPU_KM=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_PATA_IXP4XX_CF=y CONFIG_PCI=y -CONFIG_PCI_DISABLE_COMMON_QUIRKS=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PHYLIB=y +# CONFIG_PREEMPT_RCU is not set +# CONFIG_QUOTACTL is not set CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_DS1672=y -# CONFIG_RTC_DRV_DS3232 is not set -# CONFIG_RTC_DRV_ISL12022 is not set CONFIG_RTC_DRV_ISL1208=y CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_X1205=y -CONFIG_SCSI=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_SCSI_MOD=y +# CONFIG_SCSI_DMA is not set CONFIG_SENSORS_AD7418=y -# CONFIG_SENSORS_BH1780 is not set -# CONFIG_SENSORS_EMC2103 is not set -# CONFIG_SENSORS_JC42 is not set CONFIG_SENSORS_MAX6650=y -# CONFIG_SENSORS_SMM665 is not set CONFIG_SENSORS_W83781D=y -# CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -# CONFIG_SERIAL_MFD_HSU is not set -# CONFIG_SPARSE_IRQ is not set -# CONFIG_SPECTRA is not set CONFIG_SPLIT_PTLOCK_CPUS=999999 -# CONFIG_SQUASHFS_LZO is not set -# CONFIG_SQUASHFS_XATTR is not set -# CONFIG_SWAP is not set CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_UID16=y CONFIG_USB_SUPPORT=y CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_VM_EVENT_COUNTERS=y CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_XSCALE_PMU=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 -# CONFIG_ZRAM is not set -CONFIG_ZRELADDR=0x00008000