aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-10-07 02:41:08 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-08 21:17:11 -0500
commit7807feeff99082df86692704d85e05cd942214cd (patch)
treef913ffd8bad84cbc214173f886650b31c73706e0
parent86e1d113da0a20481a63febd51c7a613985a113f (diff)
downloadqemu-7807feeff99082df86692704d85e05cd942214cd.zip
qemu-7807feeff99082df86692704d85e05cd942214cd.tar.gz
qemu-7807feeff99082df86692704d85e05cd942214cd.tar.bz2
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>
-rw-r--r--Makefile.hw3
-rw-r--r--default-configs/arm-softmmu.mak1
-rw-r--r--default-configs/cris-softmmu.mak2
3 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.hw b/Makefile.hw
index ba2d390..88b59b2 100644
--- 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 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