aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 ba2d390515..88b59b2a20 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 66834c28b0..c15ac7f278 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 3726699370..c429979072 100644
--- a/default-configs/cris-softmmu.mak
+++ b/default-configs/cris-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for cris-softmmu
+
+CONFIG_NAND=y