Patchwork [12/31] Only compile nand when one target uses it

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

Comments

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

Patch

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