mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make usb devices configurable

Browse Source 
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 <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2013-02-01 10:49:43 +01:00
parent f4ece40463
commit 6c83f81542
17 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
default-configs/alpha-softmmu.mak
View File

@ -1,6 +1,7 @@
# Default configuration for alpha-softmmu
include pci.mak
include usb.mak
CONFIG_SERIAL=y
CONFIG_I8254=y
CONFIG_PCKBD=y

1
default-configs/arm-softmmu.mak
View File

@ -1,6 +1,7 @@
# Default configuration for arm-softmmu
include pci.mak
include usb.mak
CONFIG_GDBSTUB_XML=y
CONFIG_VGA=y
CONFIG_ISA_MMIO=y

1
default-configs/i386-softmmu.mak
View File

@ -1,6 +1,7 @@
# Default configuration for i386-softmmu
include pci.mak
include usb.mak
CONFIG_VGA=y
CONFIG_VGA_PCI=y
CONFIG_VGA_ISA=y

1
default-configs/m68k-softmmu.mak
View File

@ -1,5 +1,6 @@
# Default configuration for m68k-softmmu
include pci.mak
include usb.mak
CONFIG_GDBSTUB_XML=y
CONFIG_PTIMER=y

1
default-configs/mips-softmmu.mak
View File

@ -1,6 +1,7 @@
# Default configuration for mips-softmmu
include pci.mak
include usb.mak
CONFIG_ISA_MMIO=y
CONFIG_ESP=y
CONFIG_VGA=y

1
default-configs/mips64-softmmu.mak
View File

@ -1,6 +1,7 @@
# Default configuration for mips64-softmmu
include pci.mak
include usb.mak
CONFIG_ISA_MMIO=y
CONFIG_ESP=y
CONFIG_VGA=y

1
default-configs/mips64el-softmmu.mak
View File

@ -1,6 +1,7 @@
# Default configuration for mips64el-softmmu
include pci.mak
include usb.mak
CONFIG_ISA_MMIO=y
CONFIG_ESP=y
CONFIG_VGA=y

1
default-configs/mipsel-softmmu.mak
View File

@ -1,6 +1,7 @@
# Default configuration for mipsel-softmmu
include pci.mak
include usb.mak
CONFIG_ISA_MMIO=y
CONFIG_ESP=y
CONFIG_VGA=y

1
default-configs/ppc-softmmu.mak
View File

@ -1,6 +1,7 @@
# Default configuration for ppc-softmmu
include pci.mak
include usb.mak
CONFIG_GDBSTUB_XML=y
CONFIG_ISA_MMIO=y
CONFIG_ESCC=y

1
default-configs/ppc64-softmmu.mak
View File

@ -1,6 +1,7 @@
# Default configuration for ppc64-softmmu
include pci.mak
include usb.mak
CONFIG_GDBSTUB_XML=y
CONFIG_ISA_MMIO=y
CONFIG_ESCC=y

1
default-configs/ppcemb-softmmu.mak
View File

@ -1,6 +1,7 @@
# Default configuration for ppcemb-softmmu
include pci.mak
include usb.mak
CONFIG_GDBSTUB_XML=y
CONFIG_ISA_MMIO=y
CONFIG_ESCC=y

1
default-configs/sh4-softmmu.mak
View File

@ -1,6 +1,7 @@
# Default configuration for sh4-softmmu
include pci.mak
include usb.mak
CONFIG_SERIAL=y
CONFIG_PTIMER=y
CONFIG_PFLASH_CFI02=y

1
default-configs/sh4eb-softmmu.mak
View File

@ -1,6 +1,7 @@
# Default configuration for sh4eb-softmmu
include pci.mak
include usb.mak
CONFIG_SERIAL=y
CONFIG_PTIMER=y
CONFIG_PFLASH_CFI02=y

1
default-configs/sparc64-softmmu.mak
View File

@ -1,6 +1,7 @@
# Default configuration for sparc64-softmmu
include pci.mak
include usb.mak
CONFIG_ISA_MMIO=y
CONFIG_M48T59=y
CONFIG_PTIMER=y

8
default-configs/usb.mak Normal file
View File

@ -0,0 +1,8 @@
CONFIG_USB_TABLET_WACOM=y
CONFIG_USB_STORAGE_BOT=y
CONFIG_USB_STORAGE_UAS=y
CONFIG_USB_SMARTCARD=y
CONFIG_USB_AUDIO=y
CONFIG_USB_SERIAL=y
CONFIG_USB_NETWORK=y
CONFIG_USB_BLUETOOTH=y

1
default-configs/x86_64-softmmu.mak
View File

@ -1,6 +1,7 @@
# Default configuration for x86_64-softmmu
include pci.mak
include usb.mak
CONFIG_VGA=y
CONFIG_VGA_PCI=y
CONFIG_VGA_ISA=y

20
hw/usb/Makefile.objs
View File

@ -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