From 65a0244ff80d9da62654fb17564b7c9e16a7b638 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 15 Mar 2015 04:43:37 +0000 Subject: [PATCH] x86: refresh kernel config Signed-off-by: Felix Fietkau SVN-Revision: 44759 --- target/linux/x86/config-3.18 | 29 ++++++++++++++----------- target/linux/x86/generic/config-default | 11 ++++++---- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/target/linux/x86/config-3.18 b/target/linux/x86/config-3.18 index 95786f9ada63..3bcecc43ece5 100644 --- a/target/linux/x86/config-3.18 +++ b/target/linux/x86/config-3.18 @@ -7,33 +7,33 @@ # CONFIG_ALIX is not set CONFIG_AMD_NB=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_ARCH_HAS_CPU_AUTOPROBE=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y +CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y -# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set # CONFIG_ARCH_RANDOM is not set CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y +CONFIG_ARCH_USE_QUEUE_RWLOCK=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y @@ -49,6 +49,7 @@ CONFIG_BOUNCE=y CONFIG_CLKBLD_I8253=y CONFIG_CLKEVT_I8253=y CONFIG_CLKSRC_I8253=y +CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_CLONE_BACKWARDS=y CONFIG_COMPAT_VDSO=y @@ -78,7 +79,6 @@ CONFIG_CPU_SUP_UMC_32=y CONFIG_CRC16=y CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32_PCLMUL is not set -# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y # CONFIG_CRYPTO_SERPENT_SSE2_586 is not set @@ -113,28 +113,33 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_IO=y CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GLOB=y # CONFIG_GOOGLE_FIRMWARE is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y +CONFIG_HAS_IOPORT_MAP=y # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_AOUT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_KMEMCHECK=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_SOFT_DIRTY=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ATOMIC_IOMAP=y @@ -155,7 +160,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_IDE=y @@ -222,6 +226,7 @@ CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_NONE=3 CONFIG_IO_DELAY_TYPE_UDELAY=2 # CONFIG_IO_DELAY_UDELAY is not set +CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y # CONFIG_ISA is not set @@ -233,7 +238,6 @@ CONFIG_JBD2=y CONFIG_KALLSYMS=y CONFIG_KEXEC=y CONFIG_KEYBOARD_ATKBD=y -CONFIG_KTIME_SCALAR=y CONFIG_M486=y # CONFIG_M586 is not set # CONFIG_M586MMX is not set @@ -264,8 +268,6 @@ CONFIG_MODULES_USE_ELF_REL=y CONFIG_MTD_BLOCK2MTD=y # CONFIG_MTD_CFI is not set # CONFIG_MTD_COMPLEX_MAPPINGS is not set -CONFIG_MTD_SPLIT_SUPPORT=y -# CONFIG_MTD_TS5500 is not set CONFIG_MTRR=y # CONFIG_MTRR_SANITIZER is not set # CONFIG_MVIAC3_2 is not set @@ -306,8 +308,10 @@ CONFIG_PCI_GOANY=y CONFIG_PCI_MSI=y CONFIG_PCSPKR_PLATFORM=y CONFIG_PERF_EVENTS=y +CONFIG_PERF_EVENTS_INTEL_UNCORE=y CONFIG_PHYSICAL_ALIGN=0x100000 CONFIG_PHYSICAL_START=0x1000000 +CONFIG_PMC_ATOM=y CONFIG_POWER_SUPPLY=y # CONFIG_PREEMPT_RCU is not set # CONFIG_PROCESSOR_SELECT is not set @@ -323,7 +327,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_SBC8360_WDT is not set # CONFIG_SBC_EPX_C3_WATCHDOG is not set # CONFIG_SC1200_WDT is not set -# CONFIG_SC520_WDT is not set CONFIG_SCHED_HRTICK=y CONFIG_SCSI=y CONFIG_SCx200=y @@ -370,7 +373,6 @@ CONFIG_VM_EVENT_COUNTERS=y CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_W83697UG_WDT is not set # CONFIG_WAFER_WDT is not set CONFIG_X86=y # CONFIG_X86_16BIT is not set @@ -384,6 +386,7 @@ CONFIG_X86_ALIGNMENT_16=y # CONFIG_X86_CPUID is not set # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_F00F_BUG=y +CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_GENERIC=y # CONFIG_X86_GX_SUSPMOD is not set # CONFIG_X86_INTEL_PSTATE is not set diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default index ca7430d42081..eb4b357edddf 100644 --- a/target/linux/x86/generic/config-default +++ b/target/linux/x86/generic/config-default @@ -12,10 +12,10 @@ CONFIG_ACPI_BUTTON=y # CONFIG_ACPI_FAN is not set # CONFIG_ACPI_I2C_OPREGION is not set # CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set +CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y # CONFIG_ACPI_PCI_SLOT is not set CONFIG_ACPI_PROCESSOR=y # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set -# CONFIG_ACPI_PROCFS is not set # CONFIG_ACPI_PROCFS_POWER is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set # CONFIG_ACPI_SBS is not set @@ -34,6 +34,7 @@ CONFIG_AGP_INTEL=y # CONFIG_AGP_SWORKS is not set # CONFIG_AGP_VIA is not set # CONFIG_APPLE_GMUX is not set +CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y # CONFIG_ASUS_LAPTOP is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set @@ -64,7 +65,6 @@ CONFIG_DRM_I915=y CONFIG_DRM_I915_FBDEV=y CONFIG_DRM_I915_KMS=y # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set -# CONFIG_DRM_I915_UMS is not set CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_KMS_HELPER=y # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set @@ -89,6 +89,7 @@ CONFIG_FB=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_CMDLINE=y # CONFIG_FB_I810 is not set CONFIG_FB_SYS_COPYAREA=y CONFIG_FB_SYS_FILLRECT=y @@ -103,6 +104,8 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set # CONFIG_FUJITSU_LAPTOP is not set # CONFIG_GEOS is not set +CONFIG_HAVE_ACPI_APEI=y +CONFIG_HAVE_ACPI_APEI_NMI=y CONFIG_HDMI=y CONFIG_HID=y CONFIG_HID_BATTERY_STRENGTH=y @@ -122,6 +125,7 @@ CONFIG_INTEL_GTT=y CONFIG_INTEL_IDLE=y # CONFIG_INTEL_IPS is not set # CONFIG_INTEL_MENLOW is not set +CONFIG_INTERVAL_TREE=y CONFIG_ISA=y CONFIG_ISAPNP=y # CONFIG_ISCSI_IBFT_FIND is not set @@ -166,6 +170,7 @@ CONFIG_PNPACPI=y # CONFIG_PNPBIOS is not set CONFIG_PNP_DEBUG_MESSAGES=y # CONFIG_PVPANIC is not set +CONFIG_RAS=y # CONFIG_SAMSUNG_Q10 is not set CONFIG_SATA_AHCI=y # CONFIG_SCx200_ACB is not set @@ -186,7 +191,6 @@ CONFIG_USB_STORAGE=y CONFIG_USB_UHCI_HCD=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 -CONFIG_VIDEO_OUTPUT_CONTROL=y # CONFIG_WDT is not set # CONFIG_X86_ACPI_CPUFREQ is not set # CONFIG_X86_E_POWERSAVER is not set @@ -194,4 +198,3 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y # CONFIG_X86_LONGHAUL is not set # CONFIG_X86_PCC_CPUFREQ is not set CONFIG_X86_PM_TIMER=y -# CONFIG_XO15_EBOOK is not set -- 2.30.2