diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-10-07 02:41:06 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-08 21:17:11 -0500 |
| commit | 185c66c81d95a929bc3d38ca52887a8da1e6887f (patch) | |
| tree | 095d814478694808ecff65139c34934a291b2a30 | |
| parent | 642575843f38a4f05bbcaff0cbc287dee65c8a72 (diff) | |
| download | qemu-185c66c81d95a929bc3d38ca52887a8da1e6887f.tar.gz qemu-185c66c81d95a929bc3d38ca52887a8da1e6887f.tar.bz2 qemu-185c66c81d95a929bc3d38ca52887a8da1e6887f.zip | |
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>
| -rw-r--r-- | Makefile.target | 5 | ||||
| -rw-r--r-- | default-configs/arm-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/mips-softmmu.mak | 2 | ||||
| -rw-r--r-- | default-configs/mips64-softmmu.mak | 2 | ||||
| -rw-r--r-- | default-configs/mips64el-softmmu.mak | 2 | ||||
| -rw-r--r-- | default-configs/mipsel-softmmu.mak | 2 | ||||
| -rw-r--r-- | default-configs/ppc-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/ppc64-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/ppcemb-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/sparc64-softmmu.mak | 2 |
10 files changed, 16 insertions, 3 deletions
diff --git a/Makefile.target b/Makefile.target index 7a21164562..94bc03b2bd 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 15e4373ed3..66834c28b0 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 a9e89eca91..0b5bb0d63d 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 4211452738..de641659ce 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 8ca46a20d5..eb1bdc38e9 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 fe8af41943..6ace4245d3 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 cc4b83a6aa..93172b8962 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 a4d08ffd5f..05eb3b6d72 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 19ea261ce5..4259fcf4e7 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 fead2ea828..aaccf0b83e 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 |