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

5 files changed, 46 insertions, 0 deletions

diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index dfa31bba7..e35f97ac4 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -20,6 +20,7 @@ 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
 
 config ADK_KERNEL_FONTS
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 3eff14a42..a4079c37b 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -5,6 +5,7 @@ config ADK_KERNEL_INPUT
 	boolean
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -19,6 +20,16 @@ config ADK_KERNEL_INPUT
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
+config ADK_KERNEL_KEYBOARD_ATARI
+	boolean
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
+	default n
+
+config ADK_KERNEL_MOUSE_ATARI
+	boolean
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
+	default n
+
 config ADK_KERNEL_KEYBOARD_GPIO
 	boolean
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
@@ -48,6 +59,7 @@ config ADK_KERNEL_INPUT_KEYBOARD
 	boolean
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -82,6 +94,7 @@ config ADK_KERNEL_INPUT_MOUSE
 	boolean
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index 57b64d5e9..ea9bc5e5a 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -1,3 +1,6 @@
+config ADK_KERNEL_KEYS
+	boolean
+
 config ADK_KERNEL_I2C
  	boolean
  
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 710e4987e..fa0c3171f 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -31,6 +31,7 @@ config ADK_KPACKAGE_KMOD_USB
 	select ADK_KERNEL_NLS
 	depends on !ADK_KERNEL_USB
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
+	default y if ADK_TARGET_SYSTEM_QEMU_SH
 	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
@@ -115,6 +116,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	default y if ADK_TARGET_SYSTEM_QEMU_SH
 	default n
 	help
 	  The Open Host Controller Interface (OHCI) is a standard for accessing
diff --git a/target/linux/patches/3.9.11/arm-spitz.patch b/target/linux/patches/3.9.11/arm-spitz.patch
new file mode 100644
index 000000000..aea848244
--- /dev/null
+++ b/target/linux/patches/3.9.11/arm-spitz.patch
@@ -0,0 +1,27 @@
+http://lists.infradead.org/pipermail/linux-arm-kernel/2013-September/198444.html
+
+diff -Nur linux-3.9.11.orig/arch/arm/common/sharpsl_param.c linux-3.9.11/arch/arm/common/sharpsl_param.c
+--- linux-3.9.11.orig/arch/arm/common/sharpsl_param.c	2013-07-21 02:16:17.000000000 +0200
++++ linux-3.9.11/arch/arm/common/sharpsl_param.c	2013-09-18 16:27:10.000000000 +0200
+@@ -26,6 +26,7 @@
+ #ifdef CONFIG_ARCH_SA1100
+ #define PARAM_BASE	0xe8ffc000
+ #else
++#include <asm/memory.h>
+ #define PARAM_BASE	0xa0000a00
+ #endif
+ #define MAGIC_CHG(a,b,c,d) ( ( d << 24 ) | ( c << 16 )  | ( b << 8 ) | a )
+@@ -41,7 +42,12 @@
+ 
+ void sharpsl_save_param(void)
+ {
+-	memcpy(&sharpsl_param, (void *)PARAM_BASE, sizeof(struct sharpsl_param_info));
++#ifdef CONFIG_ARCH_SA1100
++	void *param_start = (void *)PARAM_BASE;
++#else
++	void *param_start = phys_to_virt(PARAM_BASE);
++#endif
++	memcpy(&sharpsl_param, param_start, sizeof(struct sharpsl_param_info));
+ 
+ 	if (sharpsl_param.comadj_keyword != COMADJ_MAGIC)
+ 		sharpsl_param.comadj=-1;