From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO1Yg-0003sW-Qd for qemu-devel@nongnu.org; Wed, 18 Feb 2015 05:08:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YO1Yc-0008MO-Ic for qemu-devel@nongnu.org; Wed, 18 Feb 2015 05:08:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO1Yc-0008ME-9y for qemu-devel@nongnu.org; Wed, 18 Feb 2015 05:08:38 -0500 From: Gerd Hoffmann Date: Wed, 18 Feb 2015 11:08:25 +0100 Message-Id: <1424254105-30237-9-git-send-email-kraxel@redhat.com> In-Reply-To: <1424254105-30237-1-git-send-email-kraxel@redhat.com> References: <1424254105-30237-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 8/8] Make sysbus EHCI devices ARM only by default List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , David Gibson From: David Gibson 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 --- 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