Message ID | 6dbe0711b421618ef6fb26b1b2c234a4a7fe589e.1251399960.git.quintela@redhat.com |
---|---|
State | Superseded |
Headers | show |
diff --git a/Makefile.target b/Makefile.target index f7b3d9a..29d5977 100644 --- a/Makefile.target +++ b/Makefile.target @@ -150,13 +150,13 @@ endif #CONFIG_BSD_USER # System emulator target ifdef CONFIG_SOFTMMU -obj-y = vl.o monitor.o pci.o loader.o isa_mmio.o machine.o \ +obj-y = vl.o monitor.o pci.o loader.o machine.o \ gdbstub.o msix.o ioport.o qemu-config.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
Signed-off-by: Juan Quintela <quintela@redhat.com> --- Makefile.target | 4 ++-- 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(+), 2 deletions(-)