summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-10-07 02:41:27 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-08 21:17:17 -0500
commitc62c4551b85f08ec56d7a5c77c465f8e8e91c642 (patch)
treecfd1763303c6084eb84d623bc477e0ecdbd877e5
parent93a604004a5b482675e791cc2c168c0781dc789a (diff)
downloadhqemu-c62c4551b85f08ec56d7a5c77c465f8e8e91c642.zip
hqemu-c62c4551b85f08ec56d7a5c77c465f8e8e91c642.tar.gz
Only compile ssi when one target uses it
Patchworks-ID: 35221 Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile3
-rw-r--r--default-configs/arm-softmmu.mak1
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f967226..6036dfb 100644
--- a/Makefile
+++ b/Makefile
@@ -115,6 +115,7 @@ obj-y += scsi-disk.o cdrom.o
obj-y += scsi-generic.o scsi-bus.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 usb-bus.o
+obj-$(CONFIG_SSI) += ssi.o
obj-$(CONFIG_SSI_SD) += ssi-sd.o
obj-$(CONFIG_SD) += 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
@@ -122,7 +123,7 @@ 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-y += qint.o qstring.o qdict.o qemu-config.o
obj-$(CONFIG_BRLAPI) += baum.o
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 615288e..a30393d 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -18,4 +18,5 @@ CONFIG_SD0303=y
CONFIG_SD0323=y
CONFIG_ADS7846=y
CONFIG_MAX111X=y
+CONFIG_SSI=y
CONFIG_SSI_SD=y
OpenPOWER on IntegriCloud