summaryrefslogtreecommitdiff
path: root/target/linux/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-09 18:09:52 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-09 18:09:52 +0100
commit648e5d6e8c5a01102f71036e10cf8841c88f687f (patch)
tree8b5b03f4de56e2ff61a3ab27d7f41c0b79336539 /target/linux/config
parent9fefab63a7256b36807cb0f5eb8a290468582c2c (diff)
parentc5eedebec9a31762dd50409c36ea2e1163b339fe (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/config')
-rw-r--r--target/linux/config/Config.in.input7
-rw-r--r--target/linux/config/Config.in.usb16
2 files changed, 19 insertions, 4 deletions
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 17c23b65c..5a01ee1e1 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -9,6 +9,10 @@ config ADK_KERNEL_INPUT
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
+config ADK_KERNEL_USB_HID
+ boolean
+ default n
+
config ADK_KERNEL_HID_LOGITECH
boolean
default n
@@ -113,6 +117,7 @@ depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCH
config ADK_KPACKAGE_KMOD_USB_HID
prompt "kmod-usb-hid..................... USB keyboard/mouse support"
tristate
+ depends on !ADK_KERNEL_USB_HID
select ADK_KERNEL_INPUT
select ADK_KERNEL_HID
select ADK_KERNEL_HID_GENERIC
@@ -122,8 +127,6 @@ config ADK_KPACKAGE_KMOD_USB_HID
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
depends on ADK_TARGET_WITH_USB
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
- default y if ADK_TARGET_SYSTEM_QEMU_SH4 && ADK_TARGET_QEMU_WITH_GRAPHIC
- default y if ADK_TARGET_SYSTEM_QEMU_SH4EB && ADK_TARGET_QEMU_WITH_GRAPHIC
default n
config ADK_KERNEL_LOGITECH_DINOVO
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index b2c750673..f6fd22339 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -1,11 +1,23 @@
menu "USB support"
-depends on ADK_TARGET_WITH_USB
+depends on ADK_TARGET_WITH_USB || ADK_HARDWARE_QEMU
config ADK_KERNEL_USB_SUPPORT
boolean
config ADK_KERNEL_USB
select ADK_KERNEL_USB_SUPPORT
+ default y if ADK_TARGET_SYSTEM_QEMU_SH4
+ default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
+ boolean
+
+config ADK_KERNEL_USB_OHCI_HCD
+ default y if ADK_TARGET_SYSTEM_QEMU_SH4
+ default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
+ boolean
+
+config ADK_KERNEL_USB_OHCI_HCD_PLATFORM
+ default y if ADK_TARGET_SYSTEM_QEMU_SH4
+ default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
boolean
config ADK_KERNEL_USB_LIBUSUAL
@@ -36,7 +48,6 @@ config ADK_KPACKAGE_KMOD_USB
select ADK_KERNEL_USB_SUPPORT
depends on !ADK_KERNEL_USB
default y if ADK_TARGET_SYSTEM_QEMU_I686
- default y if ADK_TARGET_SYSTEM_QEMU_SH4
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
@@ -108,6 +119,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default y if ADK_TARGET_SYSTEM_QEMU_SH4
+ default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
default n
help
The Open Host Controller Interface (OHCI) is a standard for accessing