summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2009-10-14 18:17:41 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2009-10-14 18:17:41 -0300
commit784d3f4620cd084bfb5ef879fc127f19f9e691e9 (patch)
treed866be004aa5b28e2c615c4878b03d8a3818cbee
parentMerge commit '3d0f151783dcb56284d56502c3ffe5430e540e38' into upstream-merge (diff)
parentOnly compile isa_mmio when one target uses it (diff)
downloadqemu-kvm-784d3f4620cd084bfb5ef879fc127f19f9e691e9.tar.gz
qemu-kvm-784d3f4620cd084bfb5ef879fc127f19f9e691e9.tar.bz2
qemu-kvm-784d3f4620cd084bfb5ef879fc127f19f9e691e9.zip
Merge commit '185c66c81d95a929bc3d38ca52887a8da1e6887f' into upstream-merge
* commit '185c66c81d95a929bc3d38ca52887a8da1e6887f': Only compile isa_mmio when one target uses it Only compile usb_ohci when one target uses it Conflicts: Makefile.target Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--Makefile.target6
-rw-r--r--default-configs/arm-softmmu.mak2
-rw-r--r--default-configs/mips-softmmu.mak2
-rw-r--r--default-configs/mips64-softmmu.mak2
-rw-r--r--default-configs/mips64el-softmmu.mak2
-rw-r--r--default-configs/mipsel-softmmu.mak2
-rw-r--r--default-configs/ppc-softmmu.mak2
-rw-r--r--default-configs/ppc64-softmmu.mak2
-rw-r--r--default-configs/ppcemb-softmmu.mak2
-rw-r--r--default-configs/sh4-softmmu.mak2
-rw-r--r--default-configs/sh4eb-softmmu.mak2
-rw-r--r--default-configs/sparc64-softmmu.mak2
12 files changed, 25 insertions, 3 deletions
diff --git a/Makefile.target b/Makefile.target
index f76c1f6d2..a083b2ee0 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -166,8 +166,7 @@ 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
@@ -176,6 +175,7 @@ obj-$(CONFIG_KVM) += kvm.o kvm-all.o
# so moved it from Makefile.hw to Makefile.target for now
obj-y += msix.o
+obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
LIBS+=-lz
sound-obj-y =
@@ -195,7 +195,7 @@ QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
# USB layer
-obj-y += usb-ohci.o
+obj-$(CONFIG_USB_OHCI) += usb-ohci.o
# PCI network cards
obj-y += eepro100.o
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 2786138b2..66834c28b 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -1,3 +1,5 @@
# Default configuration for arm-softmmu
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 a9e89eca9..0b5bb0d63 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 421145273..de641659c 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 8ca46a20d..eb1bdc38e 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 fe8af4194..6ace4245d 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 d28171b6c..93172b896 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -1,3 +1,5 @@
# Default configuration for ppc-softmmu
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 fe6652422..05eb3b6d7 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -1,3 +1,5 @@
# Default configuration for ppc64-softmmu
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 bff13e605..4259fcf4e 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -1,3 +1,5 @@
# Default configuration for ppcemb-softmmu
CONFIG_GDBSTUB_XML=y
+CONFIG_USB_OHCI=y
+CONFIG_ISA_MMIO=y
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 44668357c..9c2445b88 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for sh4-softmmu
+
+CONFIG_USB_OHCI=y
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index 2f60e53ad..fa54f1087 100644
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for sh4eb-softmmu
+
+CONFIG_USB_OHCI=y
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index fead2ea82..aaccf0b83 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