aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-10-07 02:41:14 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-08 21:17:13 -0500
commitb21fd8e60a468951b81df48ec318111b1645d832 (patch)
tree3512a08aa1e807163e4ed3046903e0e785a78d24
parent5f74377c3d3a5b9cbc55e01966b57ba0d7b11a60 (diff)
Only compile sd when one target uses it
Patchworks-ID: 35208 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 204a34f437..8c0a1f19b0 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,8 @@ 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-y += sd.o ssi-sd.o
+obj-y += 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
obj-y += bt-hci-csr.o
obj-y += buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 05b4b14aac..52b2dfa10b 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -6,3 +6,4 @@ CONFIG_ISA_MMIO=y
CONFIG_NAND=y
CONFIG_ECC=y
CONFIG_PTIMER=y
+CONFIG_SD=y