aboutsummaryrefslogtreecommitdiff
path: root/hw/usb/Makefile.objs
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 /hw/usb/Makefile.objs
parentc326529b74aa37adb216604bb6ca93cd49007012 (diff)
downloadqemu-8ffd9f4dd41f0423f0df8bef8f2e25ab4bb1a3f3.zip
qemu-8ffd9f4dd41f0423f0df8bef8f2e25ab4bb1a3f3.tar.gz
qemu-8ffd9f4dd41f0423f0df8bef8f2e25ab4bb1a3f3.tar.bz2
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 'hw/usb/Makefile.objs')
-rw-r--r--hw/usb/Makefile.objs8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 0ccd477..7443e38 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -1,6 +1,6 @@
# usb subsystem core
-common-obj-y += core.o combined-packet.o bus.o desc.o desc-msos.o
-common-obj-y += libhw.o
+common-obj-y += core.o combined-packet.o bus.o libhw.o
+common-obj-$(CONFIG_USB) += desc.o desc-msos.o
# usb host adapters
common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
@@ -11,8 +11,8 @@ common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o
# emulated usb devices
-common-obj-y += dev-hub.o
-common-obj-y += dev-hid.o
+common-obj-$(CONFIG_USB) += dev-hub.o
+common-obj-$(CONFIG_USB) += dev-hid.o
common-obj-$(CONFIG_USB_TABLET_WACOM) += dev-wacom.o
common-obj-$(CONFIG_USB_STORAGE_BOT) += dev-storage.o
common-obj-$(CONFIG_USB_STORAGE_UAS) += dev-uas.o