[Qemu-devel] [PATCH 06/15] configure sd flash only for arm softmmu

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile  |    2 +-
 configure |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 4a9fc0c..5d42cda 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,6 @@ 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
 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
@@ -90,6 +89,7 @@ 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

+obj-$(CONFIG_SD_FLASH) += sd.o
 obj-$(CONFIG_SPITZ) += max7310.o wm8750.o
 obj-$(CONFIG_NSERIES) += twl92230.o tmp105.o lm832x.o tsc2005.o
 obj-$(CONFIG_STELLARIS) += stellaris_input.o ssd0303.o
diff --git a/configure b/configure
index 3e23ea6..96849ce 100755
--- a/configure
+++ b/configure
@@ -1818,6 +1818,7 @@ ssi_bus=no
 stellaris=no
 nseries=no
 spitz=no
+sd_flash=no

 for target in $target_list; do
 target_dir="$target"
@@ -2047,6 +2048,7 @@ if test "$target_softmmu" = "yes" ; then
     stellaris=yes
     nseries=yes
     spitz=yes
+    sd_flash=yes
   ;;
   esac
 fi
@@ -2254,6 +2256,10 @@ if test "$spitz" = "yes" ; then
     echo "CONFIG_SPITZ=y" >> $config_host_mak
 fi

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