summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-10-07 02:41:10 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-08 21:17:12 -0500
commit9f376df1b2832cfc49e39036d770e0ff24a6dd53 (patch)
tree2865abd1dc2de033637b1df5cc7f69598a68f57b
parent065c7a36dfb258f74c58cc518cb0184f4ba90200 (diff)
downloadqemu-9f376df1b2832cfc49e39036d770e0ff24a6dd53.zip
Only compile esp when one target uses it
Patchworks-ID: 35206 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/mips-softmmu.mak1
-rw-r--r--default-configs/mips64-softmmu.mak1
-rw-r--r--default-configs/mips64el-softmmu.mak1
-rw-r--r--default-configs/mipsel-softmmu.mak1
-rw-r--r--default-configs/sparc-softmmu.mak1
6 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.hw b/Makefile.hw
index 9358777d6a..354d889084 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -30,7 +30,8 @@ obj-y += msix.o
obj-y += ne2000.o
# SCSI layer
-obj-y += lsi53c895a.o esp.o
+obj-y += lsi53c895a.o
+obj-$(CONFIG_ESP) += esp.o
obj-y += dma-helpers.o sysbus.o isa-bus.o
obj-$(CONFIG_QDEV_ADDR) += qdev-addr.o
diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
index 0b5bb0d63d..b452b9afa2 100644
--- a/default-configs/mips-softmmu.mak
+++ b/default-configs/mips-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for mips-softmmu
CONFIG_ISA_MMIO=y
+CONFIG_ESP=y
diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
index de641659ce..289667573d 100644
--- a/default-configs/mips64-softmmu.mak
+++ b/default-configs/mips64-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for mips64-softmmu
CONFIG_ISA_MMIO=y
+CONFIG_ESP=y
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index eb1bdc38e9..7fbd9a31f2 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for mips64el-softmmu
CONFIG_ISA_MMIO=y
+CONFIG_ESP=y
diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak
index 6ace4245d3..9e02e9327e 100644
--- a/default-configs/mipsel-softmmu.mak
+++ b/default-configs/mipsel-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for mipsel-softmmu
CONFIG_ISA_MMIO=y
+CONFIG_ESP=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 25abbd9232..efb31bc19e 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -2,3 +2,4 @@
CONFIG_QDEV_ADDR=y
CONFIG_ECC=y
+CONFIG_ESP=y