From 6c83f81542e4fda1777a74e4647a69086e44357c Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 1 Feb 2013 10:49:43 +0100 Subject: make usb devices configurable Leave the core usb devices (usb hub, tablet, mouse, keyboard) enabled unconditionally. Make the other ones configurable. Exceptions: - bluetooth: not qdevified yet, has a vl.c dependency because of that, thus disabling isn't as easy as not linking the object file. - smardcard: ccid-card-emulated depends on that one *and* CONFIG_SMARTCARD_NSS. So it isn't a one-liner and comes as separate patch because of that. Signed-off-by: Gerd Hoffmann --- hw/usb/Makefile.objs | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'hw/usb/Makefile.objs') diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index bfe5e5f875..00998b5073 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -11,14 +11,18 @@ common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o # emulated usb devices common-obj-y += dev-hub.o common-obj-y += dev-hid.o -common-obj-y += dev-wacom.o -common-obj-y += dev-storage.o -common-obj-y += dev-uas.o -common-obj-y += dev-smartcard-reader.o -common-obj-y += dev-audio.o -common-obj-y += dev-serial.o -common-obj-y += dev-network.o -common-obj-y += dev-bluetooth.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 +common-obj-$(CONFIG_USB_AUDIO) += dev-audio.o +common-obj-$(CONFIG_USB_SERIAL) += dev-serial.o +common-obj-$(CONFIG_USB_NETWORK) += dev-network.o + +# FIXME: make configurable too +CONFIG_USB_BLUETOOTH := y +CONFIG_USB_SMARTCARD := y +common-obj-$(CONFIG_USB_BLUETOOTH) += dev-bluetooth.o +common-obj-$(CONFIG_USB_SMARTCARD) += dev-smartcard-reader.o # usb redirection common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o -- cgit v1.2.1