aboutsummaryrefslogtreecommitdiff
path: root/default-configs
diff options
context:
space:
mode:
authorThomas Huth <thuth@linux.vnet.ibm.com>2015-03-17 14:52:54 +0100
committerGerd Hoffmann <kraxel@redhat.com>2015-03-18 11:50:47 +0100
commit8ffd9f4dd41f0423f0df8bef8f2e25ab4bb1a3f3 (patch)
tree33bca709743e95fb3dca9fc1fb1bb703087cafec /default-configs
parentc326529b74aa37adb216604bb6ca93cd49007012 (diff)
hw/usb: Include USB files only if necessary
Boards that do not include an USB controller should not provide USB devices. However, when running "qemu-system-s390x -device help" for example, there's still a usb-hub, usb-kbd, usb-mouse and usb-tablet in the list of "supported" devices. Let's fix that by compiling and linking the USB files only if it is really necessary. Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'default-configs')
-rw-r--r--default-configs/arm-softmmu.mak1
-rw-r--r--default-configs/usb.mak1
2 files changed, 2 insertions, 0 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 87d4e34d15..a767e4b708 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -32,6 +32,7 @@ CONFIG_DS1338=y
CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y
CONFIG_MICRODRIVE=y
+CONFIG_USB=y
CONFIG_USB_MUSB=y
CONFIG_USB_EHCI_SYSBUS=y
CONFIG_PLATFORM_BUS=y
diff --git a/default-configs/usb.mak b/default-configs/usb.mak
index 73d84895aa..f4b85684f0 100644
--- a/default-configs/usb.mak
+++ b/default-configs/usb.mak
@@ -1,3 +1,4 @@
+CONFIG_USB=y
CONFIG_USB_TABLET_WACOM=y
CONFIG_USB_STORAGE_BOT=y
CONFIG_USB_STORAGE_UAS=y