[Qemu-devel] [PATCH] Compile usb_ohci only for targets that need it

[Juan Quintela <quintela@redhat.com>]

It is only needed for arm, ppc and sh4.


Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.target |    2 +-
 configure       |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 4fdf59c..b71f214 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -175,7 +175,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/configure b/configure
index 7273b1d..03010b4 100755
--- a/configure
+++ b/configure
@@ -1798,6 +1798,7 @@ esp=no
 ecc_flash=no
 nand=no
 taddr=no
+usb_ohci=no

 for target in $target_list; do
 target_dir="$target"
@@ -2027,6 +2028,7 @@ if test "$target_softmmu" = "yes" ; then
     ptimer=yes
     ecc_flash=yes
     nand=yes
+    usb_ohci=yes
   ;;
   sparc)
     ptimer=yes
@@ -2043,6 +2045,7 @@ if test "$target_softmmu" = "yes" ; then
   ppc*)
     m48t59=yes
     escc=yes
+    usb_ohci=yes
   ;;
   mips*)
     esp=yes
@@ -2050,6 +2053,9 @@ if test "$target_softmmu" = "yes" ; then
   cris)
     nand=yes
   ;;
+  sh4)
+    usb_ohci=yes
+  ;;
   esac
 fi
 if test "$target_user_only" = "yes" ; then
@@ -2289,6 +2295,10 @@ if test "$taddr" = "yes" ; then
     echo "CONFIG_TADDR=y" >> $config_host_mak
 fi

+if test "$usb_ohci" = "yes" ; then
+    echo "CONFIG_USB_OHCI=y" >> $config_host_mak
+fi
+
 echo "/* Automatically generated by configure - do not modify */" > $config_host_h

 /bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
-- 
1.6.2.5