Patchwork [10/31] Only compile isa_mmio when one target uses it

login
register
mail settings
Submitter Juan Quintela
Date Oct. 7, 2009, 12:41 a.m.
Message ID <f9ac8a1bca7cda9600237eb73b01578d73bb400d.1254875337.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/35200/
State Accepted
Commit 185c66c81d95a929bc3d38ca52887a8da1e6887f
Headers show

Comments

Juan Quintela - Oct. 7, 2009, 12:41 a.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.target                      |    5 ++---
 default-configs/arm-softmmu.mak      |    1 +
 default-configs/mips-softmmu.mak     |    2 ++
 default-configs/mips64-softmmu.mak   |    2 ++
 default-configs/mips64el-softmmu.mak |    2 ++
 default-configs/mipsel-softmmu.mak   |    2 ++
 default-configs/ppc-softmmu.mak      |    1 +
 default-configs/ppc64-softmmu.mak    |    1 +
 default-configs/ppcemb-softmmu.mak   |    1 +
 default-configs/sparc64-softmmu.mak  |    2 ++
 10 files changed, 16 insertions(+), 3 deletions(-)

Patch

diff --git a/Makefile.target b/Makefile.target
index 7a21164..94bc03b 100644
--- 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 15e4373..66834c2 100644
--- 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 a9e89ec..0b5bb0d 100644
--- 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 4211452..de64165 100644
--- 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 8ca46a2..eb1bdc3 100644
--- 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 fe8af41..6ace424 100644
--- 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 cc4b83a..93172b8 100644
--- 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 a4d08ff..05eb3b6 100644
--- 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 19ea261..4259fcf 100644
--- 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 fead2ea..aaccf0b 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -1 +1,3 @@ 
 # Default configuration for sparc64-softmmu
+
+CONFIG_ISA_MMIO=y