summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-10-07 02:41:11 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-08 21:17:12 -0500
commit2f3c407d81fb4ee4d050c8a8376101b167c0d0c4 (patch)
treee013c4435fef0a5bf6c4556f84740dbb4a40c0f9
parent9f376df1b2832cfc49e39036d770e0ff24a6dd53 (diff)
downloadqemu-2f3c407d81fb4ee4d050c8a8376101b167c0d0c4.tar.gz
Only compile escc when one target uses it
Patchworks-ID: 35205 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/ppc-softmmu.mak1
-rw-r--r--default-configs/ppc64-softmmu.mak1
-rw-r--r--default-configs/ppcemb-softmmu.mak1
-rw-r--r--default-configs/sparc-softmmu.mak2
5 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.hw b/Makefile.hw
index 354d889084..9e40439c35 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -19,7 +19,8 @@ obj-y += watchdog.o
obj-$(CONFIG_ECC) += ecc.o
obj-$(CONFIG_NAND) += nand.o
-obj-y += m48t59.o escc.o
+obj-y += m48t59.o
+obj-$(CONFIG_ESCC) += escc.o
# PCI watchdog devices
obj-y += wdt_i6300esb.o
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 93172b8962..783b066356 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -3,3 +3,4 @@
CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y
+CONFIG_ESCC=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index 05eb3b6d72..e04d2c5bfc 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -3,3 +3,4 @@
CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y
+CONFIG_ESCC=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index 4259fcf4e7..9b1ac092f3 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -3,3 +3,4 @@
CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y
+CONFIG_ESCC=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index efb31bc19e..bec73af2f3 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -3,3 +3,5 @@
CONFIG_QDEV_ADDR=y
CONFIG_ECC=y
CONFIG_ESP=y
+CONFIG_ESCC=y
+