From: David Gibson Date: Wed, 18 Feb 2015 05:01:01 +0000 (+1100) Subject: Make sysbus EHCI devices ARM only by default X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c3cf77cb63b71618224129df41f114488e0f74e4;p=qmiga%2Fqemu.git Make sysbus EHCI devices ARM only by default 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 Signed-off-by: Gerd Hoffmann --- diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 7671ee278a..b00c2e150e 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 3fe4dff3bd..0ccd477577 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