Only compile nand when one target uses it

Patchworks-ID: 35202
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/Makefile.hw b/Makefile.hw
index ba2d390515f9a4833cbf607204d73ab14e23f056..88b59b2a2061bbaf58b47b8b81b53abbdf29b9d6 100644 (file)
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -16,7 +16,8 @@ obj-y += loader.o
 obj-y += virtio.o
 obj-y += fw_cfg.o
 obj-y += watchdog.o
-obj-y += nand.o ecc.o
+obj-y += ecc.o
+obj-$(CONFIG_NAND) += nand.o
 
 obj-y += m48t59.o escc.o
 

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 66834c28b00530fc18c0e815e9b4ca895095ad91..c15ac7f278e5611e3d872b0dfdabf0866f3f5c33 100644 (file)
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -3,3 +3,4 @@
 CONFIG_GDBSTUB_XML=y
 CONFIG_USB_OHCI=y
 CONFIG_ISA_MMIO=y
+CONFIG_NAND=y

diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmmu.mak
index 372669937051e1e64ffc0521cc9df6fd48518809..c429979072da80e854ad4b4b03cf7f3a0f3620c2 100644 (file)
--- a/default-configs/cris-softmmu.mak
+++ b/default-configs/cris-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for cris-softmmu
+
+CONFIG_NAND=y