Only compile isa_mmio when one target uses it

Patchworks-ID: 35200
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/Makefile.target b/Makefile.target
index 7a21164562f41b678525545fb238adbaefc0255b..94bc03b2bdb1aa0e914bf1fe7781f2deec2d4211 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -154,13 +154,12 @@ endif #CONFIG_BSD_USER
 # System emulator target
 ifdef CONFIG_SOFTMMU
 
-obj-y = vl.o monitor.o pci.o isa_mmio.o machine.o \
-        gdbstub.o
+obj-y = vl.o monitor.o pci.o machine.o gdbstub.o
 # virtio has to be here due to weird dependency between PCI and virtio-net.
 # need to fix this properly
 obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o
 obj-$(CONFIG_KVM) += kvm.o kvm-all.o
-
+obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
 LIBS+=-lz
 
 sound-obj-y =

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 15e4373ed369d9c15232f934acb2c1e09cffa522..66834c28b00530fc18c0e815e9b4ca895095ad91 100644 (file)
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -2,3 +2,4 @@
 
 CONFIG_GDBSTUB_XML=y
 CONFIG_USB_OHCI=y
+CONFIG_ISA_MMIO=y

diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
index a9e89eca918289eef6777a911a7b52329ef45d6b..0b5bb0d63d8ee916886ce8985b3d42d554b0d39e 100644 (file)
--- a/default-configs/mips-softmmu.mak
+++ b/default-configs/mips-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for mips-softmmu
+
+CONFIG_ISA_MMIO=y

diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
index 42114527389264a0c297a183422708ecdda489ec..de641659ce9a2adb1972ea610e19969b6ba0f0b8 100644 (file)
--- a/default-configs/mips64-softmmu.mak
+++ b/default-configs/mips64-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for mips64-softmmu
+
+CONFIG_ISA_MMIO=y

diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index 8ca46a20d55855244cb086f603a828c0c44e457b..eb1bdc38e92b86ec3e64a39cc3876890221b6376 100644 (file)
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for mips64el-softmmu
+
+CONFIG_ISA_MMIO=y

diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak
index fe8af4194302db0a0b8e6182003be9465980f5ae..6ace4245d32d96b6aa6649940a941282295c69ed 100644 (file)
--- a/default-configs/mipsel-softmmu.mak
+++ b/default-configs/mipsel-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for mipsel-softmmu
+
+CONFIG_ISA_MMIO=y

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index cc4b83a6aa4b769e0aaa46715262a5b126e504b7..93172b89627a9bd6d6c0e8d4d92ee17be03331cf 100644 (file)
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -2,3 +2,4 @@
 
 CONFIG_GDBSTUB_XML=y
 CONFIG_USB_OHCI=y
+CONFIG_ISA_MMIO=y

diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index a4d08ffd5fa51959b532de2072d117c24d52d2ce..05eb3b6d723d677d3f7c0fb2d1d9af98143b4888 100644 (file)
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -2,3 +2,4 @@
 
 CONFIG_GDBSTUB_XML=y
 CONFIG_USB_OHCI=y
+CONFIG_ISA_MMIO=y

diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index 19ea261ce500c4de873dcf0422c2209142f68df5..4259fcf4e731a44fe688d375f526c4191fba0755 100644 (file)
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -2,3 +2,4 @@
 
 CONFIG_GDBSTUB_XML=y
 CONFIG_USB_OHCI=y
+CONFIG_ISA_MMIO=y

diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index fead2ea828d18e1e6b920d69aa534b0e3a986cec..aaccf0b83e265e3fb5e03381d078dbd40d3b3296 100644 (file)
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for sparc64-softmmu
+
+CONFIG_ISA_MMIO=y