[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 8/8] Make sysbus EHCI devices ARM only by default
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 8/8] Make sysbus EHCI devices ARM only by default |
Date: |
Wed, 18 Feb 2015 11:08:25 +0100 |
From: David Gibson <address@hidden>
A number of ARM embedded boards include EHCI USB host controllers which
appear as directly mapped devices, rather than sitting on a PCI bus.
At present code to emulate such devices is included whenever EHCI support
is included. This patch adjusts teh config options to only include them
in builds targetting ARM by default.
Signed-off-by: David Gibson <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
default-configs/arm-softmmu.mak | 1 +
hw/usb/Makefile.objs | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 7671ee2..b00c2e1 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -33,6 +33,7 @@ CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y
CONFIG_MICRODRIVE=y
CONFIG_USB_MUSB=y
+CONFIG_USB_EHCI_SYSBUS=y
CONFIG_ARM11MPCORE=y
CONFIG_A9MPCORE=y
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 3fe4dff..0ccd477 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -5,7 +5,8 @@ common-obj-y += libhw.o
# usb host adapters
common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o
-common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o hcd-ehci-sysbus.o
+common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o
+common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci-sysbus.o
common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o
--
1.8.3.1
- [Qemu-devel] [PULL 0/8] usb: error handling fixes from Markus, make sysbus ehci arm-only., Gerd Hoffmann, 2015/02/18
- [Qemu-devel] [PULL 7/8] PPC: Don't use legacy -usbdevice support for setting up board, Gerd Hoffmann, 2015/02/18
- [Qemu-devel] [PULL 8/8] Make sysbus EHCI devices ARM only by default,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 2/8] usb: Improve -usbdevice error reporting a bit, Gerd Hoffmann, 2015/02/18
- [Qemu-devel] [PULL 4/8] usb: Suppress bogus error when automatic usb-hub creation fails, Gerd Hoffmann, 2015/02/18
- [Qemu-devel] [PULL 5/8] usb: Change usb_create_simple() to abort on failure, Gerd Hoffmann, 2015/02/18
- [Qemu-devel] [PULL 1/8] usb: usb_create() can't fail, drop useless error handling, Gerd Hoffmann, 2015/02/18
- [Qemu-devel] [PULL 6/8] r2d: Don't use legacy -usbdevice support for setting up board, Gerd Hoffmann, 2015/02/18
- [Qemu-devel] [PULL 3/8] usb: Do not prefix error_setg() messages with "Error: ", Gerd Hoffmann, 2015/02/18
- Re: [Qemu-devel] [PULL 0/8] usb: error handling fixes from Markus, make sysbus ehci arm-only., Peter Maydell, 2015/02/25