From 9532575bde0c80b30af94d8665c886f749d2ae1c Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 8 Dec 2014 10:04:50 +0000 Subject: [PATCH] x86: update to linux 3.14 Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43559 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/x86/Makefile | 2 +- target/linux/x86/alix2/config-default | 5 ++++ target/linux/x86/config-3.14 | 2 +- target/linux/x86/generic/config-default | 43 +++++++++++-------------------- target/linux/x86/kvm_guest/config-default | 15 +++-------- target/linux/x86/net5501/config-default | 4 +++ target/linux/x86/xen_domu/config-default | 8 ++++-- 7 files changed, 35 insertions(+), 44 deletions(-) diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 13f15c0826..52d9885e5c 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs ext4 vdi vmdk pcmcia targz SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos alix2 thincan \ rdc -KERNEL_PATCHVER:=3.10 +KERNEL_PATCHVER:=3.14 KERNELNAME:=bzImage diff --git a/target/linux/x86/alix2/config-default b/target/linux/x86/alix2/config-default index 344223447f..e7b4f264c0 100644 --- a/target/linux/x86/alix2/config-default +++ b/target/linux/x86/alix2/config-default @@ -2,12 +2,17 @@ CONFIG_ALIX=y CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DMI=y CONFIG_DMIID=y +CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y # CONFIG_DMI_SYSFS is not set # CONFIG_GEOS is not set CONFIG_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +# CONFIG_GPIO_F7188X is not set +# CONFIG_GPIO_INTEL_MID is not set CONFIG_GPIO_SYSFS=y # CONFIG_HIGHMEM64G is not set CONFIG_HWMON=y +# CONFIG_KEYBOARD_GPIO is not set # CONFIG_LEDS_CLEVO_MAIL is not set # CONFIG_M486 is not set # CONFIG_MATH_EMULATION is not set diff --git a/target/linux/x86/config-3.14 b/target/linux/x86/config-3.14 index 94be4254ad..f668e42933 100644 --- a/target/linux/x86/config-3.14 +++ b/target/linux/x86/config-3.14 @@ -116,7 +116,6 @@ CONFIG_GENERIC_IO=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_NET_UTILS=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_STRNCPY_FROM_USER=y @@ -212,6 +211,7 @@ CONFIG_INPUT_KEYBOARD=y CONFIG_INSTRUCTION_DECODER=y # CONFIG_INTEL_POWERCLAMP is not set # CONFIG_IOMMU_STRESS is not set +CONFIG_IOSF_MBI=m CONFIG_IO_DELAY_0X80=y # CONFIG_IO_DELAY_0XED is not set # CONFIG_IO_DELAY_NONE is not set diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default index 2babaab74d..70a099e8e5 100644 --- a/target/linux/x86/generic/config-default +++ b/target/linux/x86/generic/config-default @@ -1,9 +1,7 @@ # CONFIG_3C515 is not set -# CONFIG_AC3200 is not set CONFIG_ACPI=y CONFIG_ACPI_AC=y CONFIG_ACPI_BATTERY=y -CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_BUTTON=y # CONFIG_ACPI_CMPC is not set # CONFIG_ACPI_CONTAINER is not set @@ -12,14 +10,12 @@ CONFIG_ACPI_BUTTON=y # CONFIG_ACPI_DOCK is not set # CONFIG_ACPI_EC_DEBUGFS is not set # CONFIG_ACPI_FAN is not set -CONFIG_ACPI_I2C=y # CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set # 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_PROC_EVENT is not set # CONFIG_ACPI_SBS is not set CONFIG_ACPI_THERMAL=y CONFIG_ACPI_VIDEO=y @@ -36,9 +32,7 @@ CONFIG_AGP_INTEL=y # CONFIG_AGP_SWORKS is not set # CONFIG_AGP_VIA is not set # CONFIG_APPLE_GMUX is not set -# CONFIG_APRICOT is not set # CONFIG_ASUS_LAPTOP is not set -# CONFIG_AT1700 is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set # CONFIG_BACKLIGHT_APPLE is not set @@ -48,16 +42,15 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_BACKLIGHT_SAHARA is not set CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set -# CONFIG_BLK_DEV_XD is not set -CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_CPU_IDLE_GOV_MENU=y -# CONFIG_DEPCA is not set CONFIG_DMA_SHARED_BUFFER=y CONFIG_DMI=y # CONFIG_DMIID is not set +CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y # CONFIG_DMI_SYSFS is not set CONFIG_DRM=y # CONFIG_DRM_AST is not set +CONFIG_DRM_BOCHS=y # CONFIG_DRM_CIRRUS_QEMU is not set # CONFIG_DRM_GMA500 is not set # CONFIG_DRM_I2C_CH7006 is not set @@ -65,7 +58,11 @@ CONFIG_DRM=y # CONFIG_DRM_I2C_SIL164 is not set # CONFIG_DRM_I810 is not set 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 # CONFIG_DRM_MGA is not set @@ -77,56 +74,54 @@ CONFIG_DRM_KMS_HELPER=y # CONFIG_DRM_SAVAGE is not set # CONFIG_DRM_SIS is not set # CONFIG_DRM_TDFX is not set +CONFIG_DRM_TTM=y # CONFIG_DRM_UDL is not set # CONFIG_DRM_VIA is not set # CONFIG_DRM_VMWGFX is not set -CONFIG_DUMMY_CONSOLE=y # CONFIG_EFI is not set # CONFIG_EISA is not set -# CONFIG_EL1 is not set -# CONFIG_EL16 is not set -# CONFIG_EL2 is not set # CONFIG_EL3 is not set -# CONFIG_ELPLUS is not set CONFIG_FB=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_I810 is not set +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_VESA is not set -# CONFIG_FB_WMT_GE_ROPS is not set # CONFIG_FONTS is not set CONFIG_FONT_8x16=y CONFIG_FONT_8x8=y +CONFIG_FONT_SUPPORT=y CONFIG_FRAMEBUFFER_CONSOLE=y 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_HDMI=y CONFIG_HID=y CONFIG_HID_BATTERY_STRENGTH=y CONFIG_HPET=y CONFIG_HPET_MMAP=y # CONFIG_HP_ACCEL is not set -CONFIG_HW_CONSOLE=y CONFIG_I2C=y CONFIG_I2C_ALGOBIT=y CONFIG_I2C_BOARDINFO=y -CONFIG_INPUT=y -CONFIG_INPUT_KEYBOARD=y CONFIG_INPUT_MOUSE=y CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INTEL_GTT=y CONFIG_INTEL_IDLE=y # CONFIG_INTEL_IPS is not set # CONFIG_INTEL_MENLOW is not set CONFIG_ISA=y CONFIG_ISAPNP=y +# CONFIG_ISCSI_IBFT_FIND is not set CONFIG_ISO9660_FS=y # CONFIG_JOLIET is not set -CONFIG_KEYBOARD_ATKBD=y # CONFIG_LANCE is not set # CONFIG_LCD_CLASS_DEVICE is not set # CONFIG_LEDS_CLEVO_MAIL is not set @@ -145,7 +140,6 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_VSXXXAA is not set -# CONFIG_NET_VENDOR_RACAL is not set CONFIG_NLS=y CONFIG_NO_HZ=y # CONFIG_PANASONIC_LAPTOP is not set @@ -167,8 +161,8 @@ CONFIG_PNPACPI=y # CONFIG_PNPBIOS is not set CONFIG_PNP_DEBUG_MESSAGES=y # CONFIG_PVPANIC is not set +# CONFIG_SAMSUNG_Q10 is not set CONFIG_SATA_AHCI=y -CONFIG_SCHED_HRTICK=y # CONFIG_SCx200_ACB is not set CONFIG_SERIAL_8250_PNP=y # CONFIG_THINKPAD_ACPI is not set @@ -179,19 +173,13 @@ CONFIG_USB_COMMON=y CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_EHCI_PCI=y -# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OHCI_HCD_PLATFORM is not set CONFIG_USB_STORAGE=y CONFIG_USB_UHCI_HCD=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 -CONFIG_VGA_CONSOLE=y CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_WDT is not set # CONFIG_X86_ACPI_CPUFREQ is not set # CONFIG_X86_E_POWERSAVER is not set @@ -200,4 +188,3 @@ CONFIG_VT_CONSOLE=y # CONFIG_X86_PCC_CPUFREQ is not set CONFIG_X86_PM_TIMER=y # CONFIG_XO15_EBOOK is not set -# CONFIG_ZISOFS is not set diff --git a/target/linux/x86/kvm_guest/config-default b/target/linux/x86/kvm_guest/config-default index 3355c344e4..792e62afc5 100644 --- a/target/linux/x86/kvm_guest/config-default +++ b/target/linux/x86/kvm_guest/config-default @@ -1,7 +1,6 @@ CONFIG_ACPI=y # CONFIG_ACPI_AC is not set # CONFIG_ACPI_BATTERY is not set -CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_BUTTON=y # CONFIG_ACPI_CMPC is not set # CONFIG_ACPI_CONTAINER is not set @@ -16,14 +15,11 @@ 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_PROC_EVENT is not set # CONFIG_ACPI_SBS is not set # CONFIG_ACPI_THERMAL is not set # CONFIG_ACPI_WMI is not set # CONFIG_ASUS_LAPTOP is not set -CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_CPU_IDLE_GOV_MENU=y -CONFIG_DUMMY_CONSOLE=y # CONFIG_EEEPC_LAPTOP is not set # CONFIG_EFI is not set CONFIG_HOTPLUG_PCI=y @@ -37,14 +33,12 @@ CONFIG_HOTPLUG_PCI_PCIE=y # CONFIG_HPET is not set # CONFIG_HP_ACCEL is not set CONFIG_HVC_DRIVER=y -CONFIG_HW_CONSOLE=y # CONFIG_HW_RANDOM_VIRTIO is not set CONFIG_HYPERVISOR_GUEST=y -CONFIG_INPUT=y -CONFIG_INPUT_KEYBOARD=y # CONFIG_INTEL_IPS is not set -CONFIG_KEYBOARD_ATKBD=y +# CONFIG_ISCSI_IBFT_FIND is not set # CONFIG_KVM is not set +# CONFIG_KVM_DEBUG_FS is not set CONFIG_KVM_GUEST=y # CONFIG_LGUEST is not set # CONFIG_LGUEST_GUEST is not set @@ -63,13 +57,12 @@ CONFIG_PNP=y CONFIG_PNPACPI=y CONFIG_PNP_DEBUG_MESSAGES=y # CONFIG_PVPANIC is not set +# CONFIG_SAMSUNG_Q10 is not set # CONFIG_SCSI_VIRTIO is not set CONFIG_SERIAL_8250_PNP=y # CONFIG_THINKPAD_ACPI is not set # CONFIG_TOPSTAR_LAPTOP is not set # CONFIG_TOSHIBA_BT_RFKILL is not set -# CONFIG_VGACON_SOFT_SCROLLBACK is not set -CONFIG_VGA_CONSOLE=y # CONFIG_VHOST_NET is not set CONFIG_VIRTIO=y CONFIG_VIRTIO_BLK=y @@ -78,8 +71,6 @@ CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTUALIZATION=y # CONFIG_VMWARE_BALLOON is not set -CONFIG_VT=y -CONFIG_VT_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_X86_ACPI_CPUFREQ is not set # CONFIG_X86_E_POWERSAVER is not set diff --git a/target/linux/x86/net5501/config-default b/target/linux/x86/net5501/config-default index 0875405382..8b3b28b035 100644 --- a/target/linux/x86/net5501/config-default +++ b/target/linux/x86/net5501/config-default @@ -1,10 +1,14 @@ # CONFIG_ATA_PIIX is not set CONFIG_DEBUG_BUGVERBOSE=y CONFIG_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +# CONFIG_GPIO_F7188X is not set +# CONFIG_GPIO_INTEL_MID is not set CONFIG_GPIO_SYSFS=y # CONFIG_HIGHMEM64G is not set CONFIG_HWMON=y # CONFIG_ISDN is not set +# CONFIG_KEYBOARD_GPIO is not set # CONFIG_M486 is not set # CONFIG_MATH_EMULATION is not set CONFIG_MGEODE_LX=y diff --git a/target/linux/x86/xen_domu/config-default b/target/linux/x86/xen_domu/config-default index fc86036b5f..11ffdab4ad 100644 --- a/target/linux/x86/xen_domu/config-default +++ b/target/linux/x86/xen_domu/config-default @@ -1,5 +1,5 @@ # CONFIG_APM is not set -CONFIG_ARCH_CPU_PROBE_RELEASE=y +CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_ARCH_PHYS_ADDR_T_64BIT=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set CONFIG_CPU_RMAP=y @@ -14,6 +14,7 @@ CONFIG_HVC_IRQ=y CONFIG_HVC_XEN=y CONFIG_HVC_XEN_FRONTEND=y CONFIG_HYPERVISOR_GUEST=y +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y CONFIG_IOMMU_HELPER=y CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_XZ is not set @@ -22,6 +23,7 @@ CONFIG_KERNEL_GZIP=y CONFIG_MMU_NOTIFIER=y CONFIG_MPENTIUM4=y CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_NET_FLOW_LIMIT=y CONFIG_NR_CPUS=4 CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y @@ -38,14 +40,16 @@ CONFIG_RCU_STALL_COMMON=y CONFIG_RFS_ACCEL=y CONFIG_RPS=y CONFIG_SCHED_MC=y +CONFIG_SLUB_CPU_PARTIAL=y CONFIG_SMP=y CONFIG_STOP_MACHINE=y CONFIG_SWIOTLB=y CONFIG_SWIOTLB_XEN=y CONFIG_SYS_HYPERVISOR=y CONFIG_TREE_RCU=y -CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_UNINLINE_SPIN_UNLOCK=y # CONFIG_VMWARE_BALLOON is not set +CONFIG_VT_CONSOLE_SLEEP=y CONFIG_X86_32_SMP=y # CONFIG_X86_BIGSMP is not set CONFIG_X86_CMOV=y -- 2.11.0