[Qemu-commits] [COMMIT 6425758] Only compile usb_ohci when one target uses it

[Anthony Liguori]

From: Juan Quintela <address@hidden>

Patchworks-ID: 35199
Signed-off-by: Juan Quintela <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

diff --git a/Makefile.target b/Makefile.target
index debe0e4..7a21164 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 2786138..15e4373 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 d28171b..cc4b83a 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 fe66524..a4d08ff 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 bff13e6..19ea261 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 4466835..9c2445b 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 2f60e53..fa54f10 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