Only compile usb_ohci when one target uses it

Patchworks-ID: 35199
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/Makefile.target b/Makefile.target
index debe0e4c82a5f83639a6e3203157906f8dbc4efb..7a21164562f41b678525545fb238adbaefc0255b 100644 (file)
--- 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 2786138b277e052f1abe7339ce7665a40423316b..15e4373ed369d9c15232f934acb2c1e09cffa522 100644 (file)
--- 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 d28171b6cbd9130c65f96fd0b7e34a3a9bd35101..cc4b83a6aa4b769e0aaa46715262a5b126e504b7 100644 (file)
--- 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 fe665242222f25575f3fd19231236b913237dcdf..a4d08ffd5fa51959b532de2072d117c24d52d2ce 100644 (file)
--- 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 bff13e605bcd91ebf0e0e6d78b2bbd140936438d..19ea261ce500c4de873dcf0422c2209142f68df5 100644 (file)
--- 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 44668357c77bded065beec5397ffd3fcc6d73acc..9c2445b88af40ce253771610eb5147f22e321ddb 100644 (file)
--- 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 2f60e53adbb6ad8522feec0cbbacd2e33de307c8..fa54f10876f7e7ee5ac5371daeeed2454d28e576 100644 (file)
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for sh4eb-softmmu
+
+CONFIG_USB_OHCI=y