diff --git a/Makefile.hw b/Makefile.hw
index 88b59b2a20..9358777d6a 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -16,7 +16,7 @@ obj-y += loader.o
 obj-y += virtio.o
 obj-y += fw_cfg.o
 obj-y += watchdog.o
-obj-y += ecc.o
+obj-$(CONFIG_ECC) += 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 c15ac7f278..9ac6f31891 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -4,3 +4,4 @@ CONFIG_GDBSTUB_XML=y
 CONFIG_USB_OHCI=y
 CONFIG_ISA_MMIO=y
 CONFIG_NAND=y
+CONFIG_ECC=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index dc5183963b..25abbd9232 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -1,3 +1,4 @@
 # Default configuration for sparc-softmmu
 
 CONFIG_QDEV_ADDR=y
+CONFIG_ECC=y