[Qemu-devel] [PATCH 11/30] Only compile nand when one target uses it

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile.hw                      |    3 ++-
 default-configs/arm-softmmu.mak  |    1 +
 default-configs/cris-softmmu.mak |    2 ++
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Makefile.hw b/Makefile.hw
index 7f3a56a..cd035b3 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -15,7 +15,8 @@ obj-y =
 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 66834c2..c15ac7f 100644
--- 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 3726699..c429979 100644
--- a/default-configs/cris-softmmu.mak
+++ b/default-configs/cris-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for cris-softmmu
+
+CONFIG_NAND=y
-- 
1.6.2.5