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>

diff --git a/Makefile.hw b/Makefile.hw
index 9358777d6ac5334d83d7eba84ce1c4f414c174fd..354d889084705aae5ee1626948dacc4006d9fb55 100644 (file)
--- 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 0b5bb0d63d8ee916886ce8985b3d42d554b0d39e..b452b9afa29bfdf10a7c1717e7342aa71748ef69 100644 (file)
--- 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 de641659ce9a2adb1972ea610e19969b6ba0f0b8..289667573da4beecc02f347fcc7101e4a307d85f 100644 (file)
--- 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 eb1bdc38e92b86ec3e64a39cc3876890221b6376..7fbd9a31f29f89a2253f9aeea8084163a7cf08ec 100644 (file)
--- 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 6ace4245d32d96b6aa6649940a941282295c69ed..9e02e9327e0aa6ee9addf3193383d7f8bac53fb1 100644 (file)
--- 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 25abbd92320a9e16196021840cd1f50f549d6320..efb31bc19eac18a92b29516fed2be704051e39ef 100644 (file)
--- 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