diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2013-02-01 10:49:43 +0100 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-02-19 12:28:48 +0100 |
commit | 6c83f81542e4fda1777a74e4647a69086e44357c (patch) | |
tree | 5d32defd71d5720fe5fcceb37a68a23541340f6a /default-configs | |
parent | f4ece4046344230a3a030ef1e494599eaf0a5935 (diff) | |
download | hqemu-6c83f81542e4fda1777a74e4647a69086e44357c.zip hqemu-6c83f81542e4fda1777a74e4647a69086e44357c.tar.gz |
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 <kraxel@redhat.com>
Diffstat (limited to 'default-configs')
-rw-r--r-- | default-configs/alpha-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/arm-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/i386-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/m68k-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/mips-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/mips64-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/mips64el-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/mipsel-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/ppc-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/ppc64-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/ppcemb-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/sh4-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/sh4eb-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/sparc64-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/usb.mak | 8 | ||||
-rw-r--r-- | default-configs/x86_64-softmmu.mak | 1 |
16 files changed, 23 insertions, 0 deletions
diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak index 501dd41..2dbee94 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -1,6 +1,7 @@ # Default configuration for alpha-softmmu include pci.mak +include usb.mak CONFIG_SERIAL=y CONFIG_I8254=y CONFIG_PCKBD=y diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 2f1a5c9..b40f7b0 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -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 diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 2c78175..1b23025 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -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 diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak index 3e2ec37..778ea82 100644 --- a/default-configs/m68k-softmmu.mak +++ b/default-configs/m68k-softmmu.mak @@ -1,5 +1,6 @@ # Default configuration for m68k-softmmu include pci.mak +include usb.mak CONFIG_GDBSTUB_XML=y CONFIG_PTIMER=y diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index a271b1c..4f04a33 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -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 diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index 0510bb6..a5b6c3c 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -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 diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index ed3bed3..a0e6de8 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -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 diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index fa3a2ca..753dd76 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -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 diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 1f4a1cf..f9f8a81 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -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 diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index 5ff406c..dc44294 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -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 diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index aaa9cdc..1c6bcf9 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -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 diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak index 5c69acc..e08b2ee 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -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 diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak index 7cdc122..3a84535 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -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 diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak index 03e8b42..2145b6b 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -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 diff --git a/default-configs/usb.mak b/default-configs/usb.mak new file mode 100644 index 0000000..1bf9075 --- /dev/null +++ b/default-configs/usb.mak @@ -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 diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 233a856..3392f5a 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -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 |