Patchwork [18/31] Only compile sd when one target uses it

login
register
mail settings
Submitter Juan Quintela
Date Oct. 7, 2009, 12:41 a.m.
Message ID <7ebd83b762e25fbf6a91cef322a572dd51b9c24e.1254875337.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/35208/
State Accepted
Commit b21fd8e60a468951b81df48ec318111b1645d832
Headers show

Comments

Juan Quintela - Oct. 7, 2009, 12:41 a.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile                        |    3 ++-
 default-configs/arm-softmmu.mak |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

Patch

diff --git a/Makefile b/Makefile
index e6ed42e..ae1aed5 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 05b4b14..52b2dfa 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