From 642575843f38a4f05bbcaff0cbc287dee65c8a72 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 7 Oct 2009 02:41:05 +0200 Subject: [PATCH] Only compile usb_ohci when one target uses it Patchworks-ID: 35199 Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- Makefile.target | 2 +- default-configs/arm-softmmu.mak | 1 + default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/ppcemb-softmmu.mak | 1 + default-configs/sh4-softmmu.mak | 2 ++ default-configs/sh4eb-softmmu.mak | 2 ++ 7 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile.target b/Makefile.target index debe0e4c82a..7a21164562f 100644 --- a/Makefile.target +++ b/Makefile.target @@ -180,7 +180,7 @@ QEMU_CFLAGS += $(VNC_SASL_CFLAGS) obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o # USB layer -obj-y += usb-ohci.o +obj-$(CONFIG_USB_OHCI) += usb-ohci.o # PCI network cards obj-y += eepro100.o diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 2786138b277..15e4373ed36 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,3 +1,4 @@ # Default configuration for arm-softmmu CONFIG_GDBSTUB_XML=y +CONFIG_USB_OHCI=y diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index d28171b6cbd..cc4b83a6aa4 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,3 +1,4 @@ # Default configuration for ppc-softmmu CONFIG_GDBSTUB_XML=y +CONFIG_USB_OHCI=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index fe665242222..a4d08ffd5fa 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -1,3 +1,4 @@ # Default configuration for ppc64-softmmu CONFIG_GDBSTUB_XML=y +CONFIG_USB_OHCI=y diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index bff13e605bc..19ea261ce50 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -1,3 +1,4 @@ # Default configuration for ppcemb-softmmu CONFIG_GDBSTUB_XML=y +CONFIG_USB_OHCI=y diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak index 44668357c77..9c2445b88af 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1 +1,3 @@ # Default configuration for sh4-softmmu + +CONFIG_USB_OHCI=y diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak index 2f60e53adbb..fa54f10876f 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1 +1,3 @@ # Default configuration for sh4eb-softmmu + +CONFIG_USB_OHCI=y -- 2.39.5