diff options
| -rw-r--r-- | mk/kernel-ver.mk | 2 | ||||
| -rw-r--r-- | target/linux/patches/3.5/sparc-include.patch | 11 | ||||
| -rw-r--r-- | target/linux/patches/3.5/usb-defaults-off.patch | 26 | ||||
| -rw-r--r-- | toolchain/kernel-headers/patches/3.5/etrax-header.patch | 55 |
4 files changed, 35 insertions, 59 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 45d4fe65d..1d8740db1 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -8,7 +8,7 @@ ifeq ($(ADK_KERNEL_VERSION_3_5),y) KERNEL_VERSION:= 3.5 KERNEL_MOD_VERSION:= 3.5.0 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 21068f0fd262b9b3670947f7892e1d6b +KERNEL_MD5SUM:= 3ed693d5dee4f4aa05e15d3c19f6cf01 endif ifeq ($(ADK_KERNEL_VERSION_3_4_6),y) KERNEL_VERSION:= 3.4.6 diff --git a/target/linux/patches/3.5/sparc-include.patch b/target/linux/patches/3.5/sparc-include.patch deleted file mode 100644 index 2f8ffd061..000000000 --- a/target/linux/patches/3.5/sparc-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur linux-2.6.39-rc7.orig/arch/sparc/boot/btfixupprep.c linux-2.6.39-rc7/arch/sparc/boot/btfixupprep.c ---- linux-2.6.39-rc7.orig/arch/sparc/boot/btfixupprep.c 2011-05-10 04:33:54.000000000 +0200 -+++ linux-2.6.39-rc7/arch/sparc/boot/btfixupprep.c 2011-05-21 13:34:40.000000000 +0200 -@@ -25,7 +25,6 @@ - #include <errno.h> - #include <unistd.h> - #include <stdlib.h> --#include <malloc.h> - - #define MAXSYMS 1024 - diff --git a/target/linux/patches/3.5/usb-defaults-off.patch b/target/linux/patches/3.5/usb-defaults-off.patch index 31367108a..54dff2bd4 100644 --- a/target/linux/patches/3.5/usb-defaults-off.patch +++ b/target/linux/patches/3.5/usb-defaults-off.patch @@ -1,30 +1,18 @@ -diff -Nur linux-2.6.37.orig//drivers/usb/core/Kconfig linux-2.6.37/drivers/usb/core/Kconfig ---- linux-2.6.37.orig//drivers/usb/core/Kconfig 2011-01-05 01:50:19.000000000 +0100 -+++ linux-2.6.37/drivers/usb/core/Kconfig 2011-04-12 19:04:23.000000000 +0200 -@@ -59,7 +59,7 @@ - config USB_DEVICE_CLASS - bool "USB device class-devices (DEPRECATED)" - depends on USB -- default y -+ default n - ---help--- - Userspace access to USB devices is granted by device-nodes exported - directly from the usbdev in sysfs. Old versions of the driver -diff -Nur linux-2.6.37.orig//drivers/usb/host/Kconfig linux-2.6.37/drivers/usb/host/Kconfig ---- linux-2.6.37.orig//drivers/usb/host/Kconfig 2011-01-05 01:50:19.000000000 +0100 -+++ linux-2.6.37/drivers/usb/host/Kconfig 2011-04-12 19:04:48.000000000 +0200 -@@ -62,6 +62,7 @@ +diff -Nur linux-3.5.orig//drivers/usb/host/Kconfig linux-3.5/drivers/usb/host/Kconfig +--- linux-3.5.orig//drivers/usb/host/Kconfig 2012-07-21 22:58:29.000000000 +0200 ++++ linux-3.5/drivers/usb/host/Kconfig 2012-07-29 11:59:56.000000000 +0200 +@@ -66,6 +66,7 @@ config USB_EHCI_ROOT_HUB_TT bool "Root Hub Transaction Translators" - depends on USB_EHCI_HCD + depends on USB_EHCI_HCD || USB_CHIPIDEA_HOST + default n ---help--- Some EHCI chips have vendor-specific extensions to integrate transaction translators, so that no OHCI or UHCI companion -@@ -74,7 +75,7 @@ +@@ -78,7 +79,7 @@ config USB_EHCI_TT_NEWSCHED bool "Improved Transaction Translator scheduling" - depends on USB_EHCI_HCD + depends on USB_EHCI_HCD || USB_CHIPIDEA_HOST - default y + default n ---help--- diff --git a/toolchain/kernel-headers/patches/3.5/etrax-header.patch b/toolchain/kernel-headers/patches/3.5/etrax-header.patch index 559c0f322..03d19a9ab 100644 --- a/toolchain/kernel-headers/patches/3.5/etrax-header.patch +++ b/toolchain/kernel-headers/patches/3.5/etrax-header.patch @@ -1,6 +1,6 @@ -diff -Nur linux-3.4.4.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.4.4/arch/cris/include/arch-v10/arch/Kbuild ---- linux-3.4.4.orig/arch/cris/include/arch-v10/arch/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/arch/cris/include/arch-v10/arch/Kbuild 2012-07-18 07:38:39.000000000 +0200 +diff -Nur linux-3.5.orig//arch/cris/include/arch-v10/arch/Kbuild linux-3.5/arch/cris/include/arch-v10/arch/Kbuild +--- linux-3.5.orig//arch/cris/include/arch-v10/arch/Kbuild 2012-07-21 22:58:29.000000000 +0200 ++++ linux-3.5/arch/cris/include/arch-v10/arch/Kbuild 2012-07-27 14:01:25.000000000 +0200 @@ -1,4 +1,10 @@ +header-y += dma.h +header-y += io_interface_mux.h @@ -12,9 +12,9 @@ diff -Nur linux-3.4.4.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.4.4/ar +header-y += page.h +header-y += ptrace.h +header-y += system.h -diff -Nur linux-3.4.4.orig/arch/cris/include/arch-v32/arch/Kbuild linux-3.4.4/arch/cris/include/arch-v32/arch/Kbuild ---- linux-3.4.4.orig/arch/cris/include/arch-v32/arch/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/arch/cris/include/arch-v32/arch/Kbuild 2012-07-18 07:38:26.000000000 +0200 +diff -Nur linux-3.5.orig//arch/cris/include/arch-v32/arch/Kbuild linux-3.5/arch/cris/include/arch-v32/arch/Kbuild +--- linux-3.5.orig//arch/cris/include/arch-v32/arch/Kbuild 2012-07-21 22:58:29.000000000 +0200 ++++ linux-3.5/arch/cris/include/arch-v32/arch/Kbuild 2012-07-27 14:01:25.000000000 +0200 @@ -1,2 +1,7 @@ header-y += user.h header-y += cryptocop.h @@ -23,29 +23,27 @@ diff -Nur linux-3.4.4.orig/arch/cris/include/arch-v32/arch/Kbuild linux-3.4.4/ar +header-y += ptrace.h +header-y += system.h + -diff -Nur linux-3.4.4.orig/arch/cris/include/asm/Kbuild linux-3.4.4/arch/cris/include/asm/Kbuild ---- linux-3.4.4.orig/arch/cris/include/asm/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/arch/cris/include/asm/Kbuild 2012-07-18 07:38:03.000000000 +0200 -@@ -1,10 +1,13 @@ +diff -Nur linux-3.5.orig//arch/cris/include/asm/Kbuild linux-3.5/arch/cris/include/asm/Kbuild +--- linux-3.5.orig//arch/cris/include/asm/Kbuild 2012-07-21 22:58:29.000000000 +0200 ++++ linux-3.5/arch/cris/include/asm/Kbuild 2012-07-27 14:02:20.000000000 +0200 +@@ -1,9 +1,12 @@ include include/asm-generic/Kbuild.asm -header-y += arch-v10/ -header-y += arch-v32/ -- +header-y += ../arch-v10/arch/ +header-y += ../arch-v32/arch/ -+ + +header-y += elf.h header-y += ethernet.h header-y += etraxgpio.h header-y += rs485.h - header-y += rtc.h header-y += sync_serial.h +header-y += page.h +header-y += user.h -diff -Nur linux-3.4.4.orig/arch/cris/include/asm/posix_types.h linux-3.4.4/arch/cris/include/asm/posix_types.h ---- linux-3.4.4.orig/arch/cris/include/asm/posix_types.h 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/arch/cris/include/asm/posix_types.h 2012-07-18 17:10:45.000000000 +0200 +diff -Nur linux-3.5.orig//arch/cris/include/asm/posix_types.h linux-3.5/arch/cris/include/asm/posix_types.h +--- linux-3.5.orig//arch/cris/include/asm/posix_types.h 2012-07-21 22:58:29.000000000 +0200 ++++ linux-3.5/arch/cris/include/asm/posix_types.h 2012-07-27 14:01:25.000000000 +0200 @@ -6,6 +6,7 @@ #ifndef __ARCH_CRIS_POSIX_TYPES_H #define __ARCH_CRIS_POSIX_TYPES_H @@ -54,17 +52,17 @@ diff -Nur linux-3.4.4.orig/arch/cris/include/asm/posix_types.h linux-3.4.4/arch/ /* * This file is generally used by user-level software, so you need to * be a little careful about namespace pollution etc. Also, we cannot -@@ -33,4 +34,6 @@ - typedef unsigned short __kernel_old_dev_t; - #define __kernel_old_dev_t __kernel_old_dev_t +@@ -32,4 +33,6 @@ + + #include <asm-generic/posix_types.h> +#include <asm-generic/posix_types.h> + #endif /* __ARCH_CRIS_POSIX_TYPES_H */ -diff -Nur linux-3.4.4.orig/include/asm-generic/Kbuild linux-3.4.4/include/asm-generic/Kbuild ---- linux-3.4.4.orig/include/asm-generic/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/include/asm-generic/Kbuild 2012-07-18 07:38:03.000000000 +0200 -@@ -3,14 +3,17 @@ +diff -Nur linux-3.5.orig//include/asm-generic/Kbuild linux-3.5/include/asm-generic/Kbuild +--- linux-3.5.orig//include/asm-generic/Kbuild 2012-07-21 22:58:29.000000000 +0200 ++++ linux-3.5/include/asm-generic/Kbuild 2012-07-27 14:03:16.000000000 +0200 +@@ -3,15 +3,18 @@ header-y += errno-base.h header-y += errno.h header-y += fcntl.h @@ -74,6 +72,7 @@ diff -Nur linux-3.4.4.orig/include/asm-generic/Kbuild linux-3.4.4/include/asm-ge header-y += ioctl.h header-y += ioctls.h header-y += ipcbuf.h + header-y += kvm_para.h +header-y += memory_model.h header-y += mman-common.h header-y += mman.h @@ -82,14 +81,14 @@ diff -Nur linux-3.4.4.orig/include/asm-generic/Kbuild linux-3.4.4/include/asm-ge header-y += param.h header-y += poll.h header-y += posix_types.h -diff -Nur linux-3.4.4.orig/include/linux/Kbuild linux-3.4.4/include/linux/Kbuild ---- linux-3.4.4.orig/include/linux/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/include/linux/Kbuild 2012-07-18 07:38:03.000000000 +0200 -@@ -380,6 +380,7 @@ +diff -Nur linux-3.5.orig//include/linux/Kbuild linux-3.5/include/linux/Kbuild +--- linux-3.5.orig//include/linux/Kbuild 2012-07-21 22:58:29.000000000 +0200 ++++ linux-3.5/include/linux/Kbuild 2012-07-27 14:01:25.000000000 +0200 +@@ -382,6 +382,7 @@ header-y += un.h header-y += unistd.h header-y += usbdevice_fs.h +header-y += user.h header-y += utime.h header-y += utsname.h - header-y += uvcvideo.h + header-y += uuid.h |