[Qemu-devel] [PATCH 02/15] Configure ssi bus and devices only if arm-softmmu target is selected

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile  |    9 +++++----
 configure |   13 +++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index f6bdf84..0540d1b 100644
--- a/Makefile
+++ b/Makefile
@@ -76,21 +76,22 @@ obj-y = $(block-obj-y)
 obj-y += readline.o console.o host-utils.o

 obj-y += irq.o ptimer.o
-obj-y += i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o
-obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o
+obj-y += i2c.o smbus.o smbus_eeprom.o max7310.o wm8750.o
+obj-y += ssd0303.o stellaris_input.o twl92230.o
 obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.o
 obj-y += scsi-disk.o cdrom.o
 obj-y += scsi-generic.o
 obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o
 obj-y += usb-serial.o usb-net.o
-obj-y += sd.o ssi-sd.o
+obj-y += sd.o
 obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o 
usb-bt.o
 obj-y += bt-hci-csr.o
 obj-y += buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o
 obj-y += qemu-char.o aio.o net-checksum.o savevm.o
 obj-y += msmouse.o ps2.o
-obj-y += qdev.o qdev-properties.o ssi.o
+obj-y += qdev.o qdev-properties.o

+obj-$(CONFIG_SSI) += ssi.o ssi-sd.o max111x.o ssd0323.o ads7846.o
 obj-$(CONFIG_BRLAPI) += baum.o
 obj-$(CONFIG_WIN32) += tap-win32.o
 obj-$(CONFIG_POSIX) += migration-exec.o
diff --git a/configure b/configure
index e0928fe..fd02f54 100755
--- a/configure
+++ b/configure
@@ -1813,6 +1813,9 @@ if test -f ${config_host_ld}~ ; then
   fi
 fi

+# What drivers should we compile
+ssi_bus=no
+
 for target in $target_list; do
 target_dir="$target"
 config_mak=$target_dir/config.mak
@@ -2034,6 +2037,12 @@ fi
 if test "$target_softmmu" = "yes" ; then
   echo "CONFIG_SOFTMMU=y" >> $config_mak
   echo "LIBS+=$libs_softmmu" >> $config_mak
+
+  case "$target_arch2" in
+  arm*)
+    ssi_bus=yes
+  ;;
+  esac
 fi
 if test "$target_user_only" = "yes" ; then
   echo "CONFIG_USER_ONLY=y" >> $config_mak
@@ -2223,6 +2232,10 @@ fi

 done # for target in $targets

+if test "$ssi_bus" = "yes" ; then
+    echo "CONFIG_SSI=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