From patchwork Thu Aug 27 19:17:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 32287 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id B2E75B7088 for ; Fri, 28 Aug 2009 05:37:41 +1000 (EST) Received: from localhost ([127.0.0.1]:57467 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mgkmw-000325-Ku for incoming@patchwork.ozlabs.org; Thu, 27 Aug 2009 15:37:38 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MgkWd-0005UI-Qq for qemu-devel@nongnu.org; Thu, 27 Aug 2009 15:20:47 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MgkWY-0005O8-Fb for qemu-devel@nongnu.org; Thu, 27 Aug 2009 15:20:47 -0400 Received: from [199.232.76.173] (port=54409 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgkWX-0005NM-WF for qemu-devel@nongnu.org; Thu, 27 Aug 2009 15:20:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41613) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MgkWW-00062R-KL for qemu-devel@nongnu.org; Thu, 27 Aug 2009 15:20:40 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7RJKdLg005072 for ; Thu, 27 Aug 2009 15:20:40 -0400 Received: from localhost.localdomain (vpn2-8-219.ams2.redhat.com [10.36.8.219]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7RJKR07028641; Thu, 27 Aug 2009 15:20:39 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 27 Aug 2009 21:17:44 +0200 Message-Id: <6dbe0711b421618ef6fb26b1b2c234a4a7fe589e.1251399960.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 09/30] Only compile isa_mmio when one target uses it X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- 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(-) 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