From 6e3060af50ea16d772a1bea00c34eb1e39edde0f Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 24 Aug 2010 19:46:24 +0000 Subject: Update kernel to 2.6.35 SVN-Revision: 22786 --- target/linux/kirkwood/config-default | 51 +++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 13 deletions(-) (limited to 'target/linux/kirkwood/config-default') diff --git a/target/linux/kirkwood/config-default b/target/linux/kirkwood/config-default index 3d9c408..aab58c0 100644 --- a/target/linux/kirkwood/config-default +++ b/target/linux/kirkwood/config-default @@ -1,23 +1,29 @@ # CONFIG_AEABI is not set CONFIG_ALIGNMENT_TRAP=y -# CONFIG_ARCH_HAS_HOLES_MEMORYMODEL is not set -# CONFIG_ARCH_HAS_ILOG2_U32 is not set -# CONFIG_ARCH_HAS_ILOG2_U64 is not set +# CONFIG_ARCH_CNS3XXX is not set CONFIG_ARCH_KIRKWOOD=y +# CONFIG_ARCH_NUC93X is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +# CONFIG_ARCH_S5P6440 is not set +# CONFIG_ARCH_S5P6442 is not set +# CONFIG_ARCH_S5PC100 is not set +# CONFIG_ARCH_S5PV210 is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_ARCH_SHMOBILE is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SUPPORTS_MSI is not set CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ARCH_USES_GETTIMEOFFSET is not set +# CONFIG_ARCH_VEXPRESS is not set CONFIG_ARM=y +CONFIG_ARM_L1_CACHE_SHIFT=5 # CONFIG_ARM_THUMB is not set # CONFIG_ARPD is not set CONFIG_ATA=m -# CONFIG_BINARY_PRINTF is not set CONFIG_BITREVERSE=y CONFIG_CACHE_FEROCEON_L2=y # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set CONFIG_CMDLINE="rootdelay=1 root=/dev/mmcblk0p1 noinitrd console=ttyS0,115200" -CONFIG_CPU_32=y CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y CONFIG_CPU_CACHE_VIVT=y @@ -29,7 +35,7 @@ CONFIG_CPU_FEROCEON=y # CONFIG_CPU_ICACHE_DISABLE is not set CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_PABRT_LEGACY=y CONFIG_CPU_TLB_FEROCEON=y CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_USER is not set @@ -46,11 +52,13 @@ CONFIG_EXT3_FS=y # CONFIG_FPE_FASTFPE is not set # CONFIG_FPE_NWFPE is not set CONFIG_FRAME_POINTER=y +CONFIG_GENERIC_ATOMIC64=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_HAMRADIO is not set CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y @@ -61,11 +69,15 @@ 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_MLOCK=y CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_PROC_CPU=y CONFIG_HDLC=m CONFIG_HDLC_CISCO=m CONFIG_HDLC_FR=m @@ -83,28 +95,40 @@ CONFIG_INITRAMFS_SOURCE="" # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -# CONFIG_ISDN_CAPI is not set -# CONFIG_ISDN_I4L is not set CONFIG_JBD=y CONFIG_LEDS_GPIO=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_MACH_DB88F6281_BP is not set CONFIG_MACH_DOCKSTAR=y +# CONFIG_MACH_ESATA_SHEEVAPLUG is not set +# CONFIG_MACH_GURUPLUG is not set +# CONFIG_MACH_INETSPACE_V2 is not set +# CONFIG_MACH_MV88F6281GTW_GE is not set +# CONFIG_MACH_NET2BIG_V2 is not set +# CONFIG_MACH_NET5BIG_V2 is not set +# CONFIG_MACH_NETSPACE_V2 is not set +# CONFIG_MACH_OPENRD_BASE is not set +# CONFIG_MACH_OPENRD_CLIENT is not set # CONFIG_MACH_RD88F6192_NAS is not set # CONFIG_MACH_RD88F6281 is not set CONFIG_MACH_SHEEVAPLUG=y # CONFIG_MACH_TS219 is not set +# CONFIG_MACH_TS41X is not set CONFIG_MMC=y CONFIG_MMC_BLOCK=y CONFIG_MMC_MVSDIO=y +# CONFIG_MMC_TIFM_SD is not set # CONFIG_MTD_CFI is not set CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_ORION=y # CONFIG_MTD_ROOTFS_ROOT_DEV is not set # CONFIG_MTD_ROOTFS_SPLIT is not set +# CONFIG_MTD_SM_COMMON is not set CONFIG_MV643XX_ETH=y +CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NET_DSA=y # CONFIG_NET_DSA_MV88E6060 is not set # CONFIG_NET_DSA_MV88E6123_61_65 is not set @@ -114,25 +138,26 @@ CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y CONFIG_NET_DSA_TAG_DSA=y # CONFIG_NET_DSA_TAG_EDSA is not set # CONFIG_NET_DSA_TAG_TRAILER is not set -# CONFIG_NO_IOPORT is not set +CONFIG_NLS=m CONFIG_OUTER_CACHE=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PATA_ARTOP=m CONFIG_PCI=y +CONFIG_PERF_USE_VMALLOC=y CONFIG_PHYLIB=y CONFIG_PLAT_ORION=y +# CONFIG_PLAT_SPEAR is not set CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_MV=y CONFIG_SATA_PMP=y CONFIG_SCSI=m +CONFIG_SCSI_MOD=m # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SDIO_UART is not set # CONFIG_SERIAL_8250_EXTENDED is not set -# CONFIG_SLOW_WORK is not set -CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_SPLIT_PTLOCK_CPUS=999999 CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_TRACING_SUPPORT=y CONFIG_UID16=y CONFIG_USB=m CONFIG_USB_EHCI_HCD=m -- cgit v1.1