Only compile sd when one target uses it

Patchworks-ID: 35208
Signed-off-by: Juan Quintela <[email protected]>
Signed-off-by: Anthony Liguori <[email protected]>

diff --git a/Makefile b/Makefile
index 204a34f437593a58c37832ff5efda2703f5b01c0..8c0a1f19b0ee53e91b604afaa1cb84e6245f31e9 100644 (file)
--- 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 05b4b14aacd87113e8900c034a180544fde86171..52b2dfa10b7a1ee1e806c50a7d24fade466673f4 100644 (file)
--- 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