Merge branch 'master' of git+ssh://openadk.org/git/openadk

24 files changed, 49 insertions, 7 deletions

diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu
index b892f1455..17e82c3c3 100644
--- a/target/linux/config/Config.in.cpu
+++ b/target/linux/config/Config.in.cpu
@@ -35,3 +35,4 @@ config ADK_KERNEL_USE_GENERIC_SMP_HELPERS
 
 config ADK_KERNEL_VFP
 	boolean
+
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index 77871f171..c22ae210c 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -3,7 +3,7 @@ config ADK_KERNEL_FS_POSIX_ACL
 	default y
 
 config ADK_KPACKAGE_KMOD_CIFS
-	prompt "kmod-fs-cifs...................... CIFS support"
+	prompt "kmod-cifs......................... CIFS support"
 	tristate
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index e35f97ac4..3e59afda8 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -19,7 +19,6 @@ config ADK_KERNEL_VT_CONSOLE
 config ADK_KERNEL_VGA_CONSOLE
 	boolean
 	default y if ADK_HARDWARE_VBOX
-	default y if ADK_HARDWARE_QEMU
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default n
 
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 587a7f2c9..51d25c4ac 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -140,6 +140,8 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	tristate
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_HID
+	select ADK_KERNEL_INPUT_KEYBOARD
+	select ADK_KERNEL_INPUT_MOUSEDEV
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
         depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on ADK_TARGET_WITH_USB
@@ -152,12 +154,14 @@ config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
 	tristate
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_INPUT_KEYBOARD
+	depends on !ADK_KERNEL_KEYBOARD_ATKBD
 	default n
 
 config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV
-	prompt "kmod-input-mouse................. Mouse support (PS/2)"
+	prompt "kmod-input-mouse................. Mouse support"
 	tristate
 	select ADK_KERNEL_INPUT
+	depends on !ADK_KERNEL_INPUT_MOUSEDEV
 	default n
 
 config ADK_KPACKAGE_KMOD_INPUT_EVDEV
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 0bff56a1b..dcf9f03ec 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -65,8 +65,6 @@ config ADK_KERNEL_PCNET32
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
-	default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL
-	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
 	default n
 	help
 
@@ -166,6 +164,10 @@ config ADK_KERNEL_E1000
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64EL
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL
 	default n
 	help
 
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index 77d24ede7..817000d63 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -36,14 +36,14 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
 
 config ADK_KPACKAGE_KMOD_FULL_NAT
 	tristate "Meta package for Full NAT"
-	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_60
+	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_65
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_9_11
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_5
 
 config ADK_KPACKAGE_KMOD_NF_NAT
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
-	depends on ADK_KERNEL_VERSION_3_4_60
+	depends on ADK_KERNEL_VERSION_3_4_65
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 1459039b6..e2e3051da 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -176,6 +176,8 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on ADK_KPACKAGE_KMOD_USB
+	default y if ADK_TARGET_SYSTEM_QEMU_I686
+	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
diff --git a/target/linux/patches/3.11.5/export-symbol-for-exmap.patch b/target/linux/patches/3.11.5/export-symbol-for-exmap.patch
new file mode 100644
index 000000000..4f0fc8449
--- /dev/null
+++ b/target/linux/patches/3.11.5/export-symbol-for-exmap.patch
@@ -0,0 +1,11 @@
+diff -Nur linux-3.11.5.orig/kernel/pid.c linux-3.11.5/kernel/pid.c
+--- linux-3.11.5.orig/kernel/pid.c	2013-10-14 03:14:45.000000000 +0200
++++ linux-3.11.5/kernel/pid.c	2013-10-29 15:37:02.000000000 +0100
+@@ -450,6 +450,7 @@
+ {
+ 	return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
+ }
++EXPORT_SYMBOL(find_task_by_vpid);
+ 
+ struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
+ {
diff --git a/target/linux/patches/3.11.5/mips-lzo-fix.patch b/target/linux/patches/3.11.5/mips-lzo-fix.patch
new file mode 100644
index 000000000..0740bdc6a
--- /dev/null
+++ b/target/linux/patches/3.11.5/mips-lzo-fix.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-3.11.5.orig/arch/mips/boot/compressed/decompress.c linux-3.11.5/arch/mips/boot/compressed/decompress.c
+--- linux-3.11.5.orig/arch/mips/boot/compressed/decompress.c	2013-10-14 03:14:45.000000000 +0200
++++ linux-3.11.5/arch/mips/boot/compressed/decompress.c	2013-11-08 18:19:47.000000000 +0100
+@@ -43,7 +43,7 @@
+ /* activate the code for pre-boot environment */
+ #define STATIC static
+ 
+-#ifdef CONFIG_KERNEL_GZIP
++#if defined(CONFIG_KERNEL_GZIP) || defined(CONFIG_KERNEL_LZO)
+ void *memcpy(void *dest, const void *src, size_t n)
+ {
+ 	int i;
diff --git a/target/linux/patches/3.11.5/ppc64-missing-zlib.patch b/target/linux/patches/3.11.5/ppc64-missing-zlib.patch
new file mode 100644
index 000000000..c6e0616be
--- /dev/null
+++ b/target/linux/patches/3.11.5/ppc64-missing-zlib.patch
@@ -0,0 +1,11 @@
+diff -Nur linux-3.11.5.orig/arch/powerpc/platforms/pseries/Kconfig linux-3.11.5/arch/powerpc/platforms/pseries/Kconfig
+--- linux-3.11.5.orig/arch/powerpc/platforms/pseries/Kconfig	2013-10-14 03:14:45.000000000 +0200
++++ linux-3.11.5/arch/powerpc/platforms/pseries/Kconfig	2013-11-01 15:23:09.000000000 +0100
+@@ -17,6 +17,7 @@
+ 	select PPC_NATIVE
+ 	select PPC_PCI_CHOICE if EXPERT
+ 	select ZLIB_DEFLATE
++	select ZLIB_INFLATE
+ 	select PPC_DOORBELL
+ 	select HAVE_CONTEXT_TRACKING
+ 	select HOTPLUG_CPU if SMP
diff --git a/target/linux/patches/3.4.60/bsd-compatibility.patch b/target/linux/patches/3.4.65/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.4.60/bsd-compatibility.patch
+++ b/target/linux/patches/3.4.65/bsd-compatibility.patch
diff --git a/target/linux/patches/3.4.60/cris-etrax.patch b/target/linux/patches/3.4.65/cris-etrax.patch
index a80d9a8b8..a80d9a8b8 100644
--- a/target/linux/patches/3.4.60/cris-etrax.patch
+++ b/target/linux/patches/3.4.65/cris-etrax.patch
diff --git a/target/linux/patches/3.4.60/defaults.patch b/target/linux/patches/3.4.65/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.4.60/defaults.patch
+++ b/target/linux/patches/3.4.65/defaults.patch
diff --git a/target/linux/patches/3.4.60/gemalto.patch b/target/linux/patches/3.4.65/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.4.60/gemalto.patch
+++ b/target/linux/patches/3.4.65/gemalto.patch
diff --git a/target/linux/patches/3.4.60/lemote-rfkill.patch b/target/linux/patches/3.4.65/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.4.60/lemote-rfkill.patch
+++ b/target/linux/patches/3.4.65/lemote-rfkill.patch
diff --git a/target/linux/patches/3.4.60/module-alloc-size-check.patch b/target/linux/patches/3.4.65/module-alloc-size-check.patch
index a792ac60a..a792ac60a 100644
--- a/target/linux/patches/3.4.60/module-alloc-size-check.patch
+++ b/target/linux/patches/3.4.65/module-alloc-size-check.patch
diff --git a/target/linux/patches/3.4.60/non-static.patch b/target/linux/patches/3.4.65/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.4.60/non-static.patch
+++ b/target/linux/patches/3.4.65/non-static.patch
diff --git a/target/linux/patches/3.4.60/sparc-include.patch b/target/linux/patches/3.4.65/sparc-include.patch
index 2f8ffd061..2f8ffd061 100644
--- a/target/linux/patches/3.4.60/sparc-include.patch
+++ b/target/linux/patches/3.4.65/sparc-include.patch
diff --git a/target/linux/patches/3.4.60/startup.patch b/target/linux/patches/3.4.65/startup.patch
index 68e8987b0..68e8987b0 100644
--- a/target/linux/patches/3.4.60/startup.patch
+++ b/target/linux/patches/3.4.65/startup.patch
diff --git a/target/linux/patches/3.4.60/usb-defaults-off.patch b/target/linux/patches/3.4.65/usb-defaults-off.patch
index 31367108a..31367108a 100644
--- a/target/linux/patches/3.4.60/usb-defaults-off.patch
+++ b/target/linux/patches/3.4.65/usb-defaults-off.patch
diff --git a/target/linux/patches/3.4.60/uuid.patch b/target/linux/patches/3.4.65/uuid.patch
index ca23accdf..ca23accdf 100644
--- a/target/linux/patches/3.4.60/uuid.patch
+++ b/target/linux/patches/3.4.65/uuid.patch
diff --git a/target/linux/patches/3.4.60/vga-cons-default-off.patch b/target/linux/patches/3.4.65/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.4.60/vga-cons-default-off.patch
+++ b/target/linux/patches/3.4.65/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.4.60/wlan-cf.patch b/target/linux/patches/3.4.65/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.4.60/wlan-cf.patch
+++ b/target/linux/patches/3.4.65/wlan-cf.patch
diff --git a/target/linux/patches/3.4.60/zlib-inflate.patch b/target/linux/patches/3.4.65/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.4.60/zlib-inflate.patch
+++ b/target/linux/patches/3.4.65/zlib-inflate.patch