diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-30 17:25:48 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-30 17:25:48 +0200 |
commit | 6543c18cf4c000995ad69b9578caeae8aecdd80f (patch) | |
tree | 4ce97d5da7bf3c25df4bdc5e1ed1f153567c72eb /target/linux | |
parent | c2bfcd9230585708de63dbb15e160c1f66749a22 (diff) | |
parent | 9e2f663b590fb3f1fcf2f03fe057d129bf58764a (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/config/Config.in.graphics | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.input | 13 | ||||
-rw-r--r-- | target/linux/config/Config.in.usb | 2 |
3 files changed, 16 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.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 |