Commit 8ffd9f4d authored by Thomas Huth's avatar Thomas Huth Committed by Gerd Hoffmann
Browse files

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: default avatarThomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent c326529b

default-configs/arm-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -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

default-configs/usb.mak

+1 −0
Original line number Diff line number Diff line 
CONFIG_USB=y

CONFIG_USB_TABLET_WACOM=y

CONFIG_USB_STORAGE_BOT=y

CONFIG_USB_STORAGE_UAS=y

hw/usb/Makefile.objs

+4 −4
Original line number Diff line number Diff line 
# 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