From c6d9304d17578c2b7f8c4fdd146d782dd5cccc65 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 16 Nov 2012 16:32:39 +0000 Subject: [PATCH] resync kernel configuration with 3.6 kernel Signed-off-by: Florian Fainelli SVN-Revision: 34215 --- target/linux/sparc/config-default | 45 ++++++++++++++++++------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/target/linux/sparc/config-default b/target/linux/sparc/config-default index fb0abb6f52..d5114ba1d5 100644 --- a/target/linux/sparc/config-default +++ b/target/linux/sparc/config-default @@ -1,8 +1,8 @@ CONFIG_64BIT=y CONFIG_ARCH_DEFCONFIG="arch/sparc/configs/sparc64_defconfig" +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_ARCH_NO_VIRT_TO_BUS=y -CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y CONFIG_ARCH_SPARSEMEM_ENABLE=y @@ -13,18 +13,23 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_ATA=y CONFIG_AUDIT_ARCH=y # CONFIG_BBC_I2C is not set +CONFIG_BCMA_POSSIBLE=y CONFIG_BITS=64 -# CONFIG_BLK_DEV_INITRD is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_SD=y CONFIG_BLOCK_COMPAT=y # CONFIG_BRIDGE is not set +CONFIG_CMDLINE="console=ttyS0 init=/etc/preinit" +CONFIG_CMDLINE_BOOL=y CONFIG_COMPAT=y CONFIG_COMPAT_BINFMT_ELF=y CONFIG_COMPAT_BRK=y CONFIG_COMPAT_NETLINK_MESSAGES=y CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_CPU_RMAP=y +CONFIG_CRAMFS=y CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_DCFLUSH is not set CONFIG_DECOMPRESS_LZMA=y # CONFIG_DISPLAY7SEG is not set CONFIG_DNOTIFY=y @@ -34,13 +39,12 @@ CONFIG_ELF_CORE=y CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENVCTRL is not set CONFIG_FB=y +# CONFIG_FB_GRVGA is not set # CONFIG_FB_SBUS is not set -# CONFIG_FB_SM7XX is not set -# CONFIG_FB_XGI is not set +# CONFIG_FB_WMT_GE_ROPS is not set # CONFIG_FB_XVR1000 is not set # CONFIG_FB_XVR2500 is not set # CONFIG_FB_XVR500 is not set -# CONFIG_FIRMWARE_EDID is not set CONFIG_FIRMWARE_IN_KERNEL=y # CONFIG_FONTS is not set # CONFIG_FONT_SUN12x22 is not set @@ -53,17 +57,18 @@ CONFIG_GENERIC_ACL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_GENERIC_FIND_NEXT_BIT=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PCI_IOMAP=y # CONFIG_GRETH is not set # CONFIG_HAMRADIO is not set CONFIG_HAPPYMEAL=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DYNAMIC_FTRACE=y @@ -73,12 +78,16 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y CONFIG_HAVE_IDE=y +CONFIG_HAVE_IRQ_WORK=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_RCU_TABLE_FREE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_SYSCALL_WRAPPERS=y @@ -89,31 +98,30 @@ CONFIG_HW_CONSOLE=y CONFIG_HZ=250 # CONFIG_HZ_100 is not set CONFIG_HZ_250=y -# CONFIG_HZ_300 is not set -CONFIG_INOTIFY_USER=y +CONFIG_INITRAMFS_SOURCE="" CONFIG_INPUT=y CONFIG_INPUT_EVDEV=y CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_SPARCSPKR is not set CONFIG_IOMMU_HELPER=y +CONFIG_IRQ_PREFLOW_FASTEOI=y # CONFIG_LEDS_SUNFIRE is not set CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 -CONFIG_LOCK_KERNEL=y -# CONFIG_MISC_DEVICES is not set # CONFIG_MTD is not set CONFIG_MUTEX_SPIN_ON_OWNER=y -# CONFIG_MYRI_SBUS is not set CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NR_CPUS=4 -CONFIG_NR_QUICK=1 # CONFIG_NUMA is not set # CONFIG_OBP_FLASH is not set CONFIG_OF=y CONFIG_OF_DEVICE=y +CONFIG_OF_NET=y +CONFIG_OF_PCI=y +CONFIG_OF_PROMTREE=y CONFIG_PAGEFLAGS_EXTENDED=y # CONFIG_PARTITION_ADVANCED is not set CONFIG_PATA_CMD64X=y @@ -122,9 +130,10 @@ CONFIG_PCI_DISABLE_COMMON_QUIRKS=y CONFIG_PCI_DOMAINS=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PHYS_ADDR_T_64BIT=y +# CONFIG_PREEMPT_RCU is not set CONFIG_PROC_PAGE_MONITOR=y -CONFIG_QUICKLIST=y CONFIG_RELAY=y +CONFIG_RFS_ACCEL=y CONFIG_RPS=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_BQ4802=y @@ -136,15 +145,12 @@ CONFIG_SATA_PMP=y CONFIG_SBUS=y CONFIG_SBUSCHAR=y CONFIG_SCHED_HRTICK=y -# CONFIG_SCHED_MC is not set -# CONFIG_SCHED_SMT is not set CONFIG_SCSI=y # CONFIG_SCSI_LOWLEVEL is not set # CONFIG_SCSI_MULTI_LUN is not set CONFIG_SECCOMP=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set CONFIG_SERIAL_SUNCORE=y # CONFIG_SERIAL_SUNHV is not set CONFIG_SERIAL_SUNSAB=y @@ -181,6 +187,7 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_TREE_RCU=y CONFIG_UID16=y # CONFIG_US3_MC is not set +CONFIG_USB_ARCH_HAS_XHCI=y CONFIG_USB_SUPPORT=y CONFIG_USE_GENERIC_SMP_HELPERS=y # CONFIG_VLAN_8021Q is not set @@ -189,4 +196,6 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_WATCHDOG is not set +CONFIG_XPS=y +CONFIG_XZ_DEC=y CONFIG_ZONE_DMA_FLAG=0