[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/31] Only compile isa_mmio when one target uses it
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 10/31] Only compile isa_mmio when one target uses it |
Date: |
Wed, 7 Oct 2009 02:41:06 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
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(-)
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
--
1.6.2.5
- [Qemu-devel] [PATCH 01/31] Don't include config-host.mak from inside config.mak, (continued)
- [Qemu-devel] [PATCH 01/31] Don't include config-host.mak from inside config.mak, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 02/31] Move generation of config-host.h to Makefile from configure, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 03/31] Remove useless check for config-host.mak, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 04/31] Rename config.{h, mak} config-target.{h, mak}, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 07/31] Generate config-devices.h, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 05/31] Move generation of config-target.h to Makefile from configure, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 06/31] Add new config-devices.mak for each target, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 08/31] Generate gdbstub-xml.c only when needed, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 09/31] Only compile usb_ohci when one target uses it, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 10/31] Only compile isa_mmio when one target uses it,
Juan Quintela <=
- [Qemu-devel] [PATCH 11/31] Only compile qdev_addr when one target uses it, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 13/31] Only compile ecc when one target uses it, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 12/31] Only compile nand when one target uses it, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 16/31] Only compile m48t59 when one target uses it, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 15/31] Only compile escc when one target uses it, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 14/31] Only compile esp when one target uses it, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 17/31] Only compile ptimer when one target uses it, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 18/31] Only compile sd when one target uses it, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 20/31] Only compile wm8750 when one target uses it, Juan Quintela, 2009/10/06
- [Qemu-devel] [PATCH 19/31] Only compile max7310 when one target uses it, Juan Quintela, 2009/10/06