From patchwork Thu Mar 25 20:24:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 48593 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 ozlabs.org (Postfix) with ESMTPS id 7EB65B7CF0 for ; Fri, 26 Mar 2010 08:20:32 +1100 (EST) Received: from localhost ([127.0.0.1]:46922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuuJ3-0006FQ-SN for incoming@patchwork.ozlabs.org; Thu, 25 Mar 2010 17:09:33 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NutbM-0007Zp-B0 for qemu-devel@nongnu.org; Thu, 25 Mar 2010 16:24:24 -0400 Received: from [140.186.70.92] (port=54881 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NutbH-0007V6-DP for qemu-devel@nongnu.org; Thu, 25 Mar 2010 16:24:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NutbF-00063Q-8k for qemu-devel@nongnu.org; Thu, 25 Mar 2010 16:24:19 -0400 Received: from mail-pz0-f194.google.com ([209.85.222.194]:38643) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NutbE-00063G-VO for qemu-devel@nongnu.org; Thu, 25 Mar 2010 16:24:17 -0400 Received: by pzk32 with SMTP id 32so2077464pzk.4 for ; Thu, 25 Mar 2010 13:24:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=55SfLZkeXAYl2ZGKdGhMgKF/wtHNMt1KIZrUP+kb8KM=; b=cizdrplbL2LAYpexfRhfr1irMbdhVkjV44MqMoMXRnaG6u5UD4PS+msrrEYFQEJqmH ZgigSX19bXtP8ONwEAHFet9haAXsdhgrWQ61CaIp/hMSW2xowqE9GXX7OK12mtc4/G5A FmBfUnjdcVxRj7bwvT8dr0BhOkJrbgHmF31lA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=lZTE21sO0SoEEjb6ot4GCIdhXu+quMPPXNdwgBihvk9cL1ofYx/zavHqrYYrVq1ioj Ro3XxFgYRPyydgIPaNDpNs+6R3CfVRD0ISAVhEtbzcbkuRv17za6fVTZFVwwHzAQGKN9 NQiYIThmggJbApWSFUYF/JndKsDUK2AnEbmz8= MIME-Version: 1.0 Received: by 10.141.15.8 with SMTP id s8mr6590979rvi.45.1269548652147; Thu, 25 Mar 2010 13:24:12 -0700 (PDT) Date: Thu, 25 Mar 2010 22:24:12 +0200 Message-ID: From: Blue Swirl To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 1/3] Compile some MIPS devices only once 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 Move CPU specific declarations to a separate file. Signed-off-by: Blue Swirl --- Makefile.objs | 6 ++++++ Makefile.target | 8 +++----- default-configs/mips-softmmu.mak | 5 +++++ default-configs/mips64-softmmu.mak | 5 +++++ default-configs/mips64el-softmmu.mak | 5 +++++ default-configs/mipsel-softmmu.mak | 5 +++++ hw/mips.h | 10 ---------- hw/mips_addr.c | 2 +- hw/mips_cpudevs.h | 15 +++++++++++++++ hw/mips_int.c | 2 +- hw/mips_jazz.c | 1 + hw/mips_malta.c | 1 + hw/mips_mipssim.c | 1 + hw/mips_r4k.c | 1 + hw/mips_timer.c | 2 +- 15 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 hw/mips_cpudevs.h diff --git a/Makefile.objs b/Makefile.objs index fe81f6c..77d1fb9 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -178,6 +178,12 @@ hw-obj-$(CONFIG_QDEV_ADDR) += qdev-addr.o # VGA hw-obj-$(CONFIG_VGA_PCI) += vga-pci.o hw-obj-$(CONFIG_VGA_ISA) += vga-isa.o +hw-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o + +hw-obj-$(CONFIG_RC4030) += rc4030.o +hw-obj-$(CONFIG_DP8393X) += dp8393x.o +hw-obj-$(CONFIG_DS1225Y) += ds1225y.o +hw-obj-$(CONFIG_MIPSNET) += mipsnet.o # Sound sound-obj-y = diff --git a/Makefile.target b/Makefile.target index a17de90..db9f50c 100644 --- a/Makefile.target +++ b/Makefile.target @@ -211,12 +211,10 @@ obj-ppc-$(CONFIG_FDT) += device_tree.o obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o obj-mips-y += mips_addr.o mips_timer.o mips_int.o -obj-mips-y += dma.o vga.o i8259.o rc4030.o -obj-mips-y += vga-isa-mm.o -obj-mips-y += g364fb.o jazz_led.o dp8393x.o -obj-mips-y += gt64xxx.o pckbd.o mc146818rtc.o acpi.o ds1225y.o +obj-mips-y += dma.o vga.o i8259.o +obj-mips-y += g364fb.o jazz_led.o +obj-mips-y += gt64xxx.o pckbd.o mc146818rtc.o acpi.o obj-mips-y += piix4.o cirrus_vga.o -obj-mips-y += mipsnet.o obj-mips-y += pflash_cfi01.o obj-mips-y += vmware_vga.o diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index cb48ed1..c438c1c 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -4,6 +4,7 @@ CONFIG_ISA_MMIO=y CONFIG_ESP=y CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y +CONFIG_VGA_ISA_MM=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_I8254=y @@ -17,3 +18,7 @@ CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y CONFIG_NE2000_ISA=y CONFIG_SOUND=y +CONFIG_RC4030=y +CONFIG_DP8393X=y +CONFIG_DS1225Y=y +CONFIG_MIPSNET=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index 585d6bb..a0d7f31 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -4,6 +4,7 @@ CONFIG_ISA_MMIO=y CONFIG_ESP=y CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y +CONFIG_VGA_ISA_MM=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_I8254=y @@ -17,3 +18,7 @@ CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y CONFIG_NE2000_ISA=y CONFIG_SOUND=y +CONFIG_RC4030=y +CONFIG_DP8393X=y +CONFIG_DS1225Y=y +CONFIG_MIPSNET=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index f68c2e0..5ff0581 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -4,6 +4,7 @@ CONFIG_ISA_MMIO=y CONFIG_ESP=y CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y +CONFIG_VGA_ISA_MM=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_I8254=y @@ -17,3 +18,7 @@ CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y CONFIG_NE2000_ISA=y CONFIG_SOUND=y +CONFIG_RC4030=y +CONFIG_DP8393X=y +CONFIG_DS1225Y=y +CONFIG_MIPSNET=y diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index bb4644d..d5b9d79 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -4,6 +4,7 @@ CONFIG_ISA_MMIO=y CONFIG_ESP=y CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y +CONFIG_VGA_ISA_MM=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_I8254=y @@ -17,3 +18,7 @@ CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y CONFIG_NE2000_ISA=y CONFIG_SOUND=y +CONFIG_RC4030=y +CONFIG_DP8393X=y +CONFIG_DS1225Y=y +CONFIG_MIPSNET=y diff --git a/hw/mips.h b/hw/mips.h index 9484ea7..30791a8 100644 --- a/hw/mips.h +++ b/hw/mips.h @@ -20,16 +20,6 @@ void mipsnet_init(int base, qemu_irq irq, NICInfo *nd); /* jazz_led.c */ extern void jazz_led_init(target_phys_addr_t base); -/* mips_addr.c */ -uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr); -uint64_t cpu_mips_phys_to_kseg0(void *opaque, uint64_t addr); - -/* mips_int.c */ -extern void cpu_mips_irq_init_cpu(CPUState *env); - -/* mips_timer.c */ -extern void cpu_mips_clock_init(CPUState *); - /* rc4030.c */ typedef struct rc4030DMAState *rc4030_dma; void rc4030_dma_memory_rw(void *opaque, target_phys_addr_t addr, uint8_t *buf, int len, int is_write); diff --git a/hw/mips_addr.c b/hw/mips_addr.c index b96fea0..aa1c7d8 100644 --- a/hw/mips_addr.c +++ b/hw/mips_addr.c @@ -21,7 +21,7 @@ */ #include "hw.h" -#include "mips.h" +#include "mips_cpudevs.h" uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr) { diff --git a/hw/mips_cpudevs.h b/hw/mips_cpudevs.h new file mode 100644 index 0000000..db82b41 --- /dev/null +++ b/hw/mips_cpudevs.h @@ -0,0 +1,15 @@ +#ifndef HW_MIPS_CPUDEVS_H +#define HW_MIPS_CPUDEVS_H +/* Definitions for MIPS CPU internal devices. */ + +/* mips_addr.c */ +uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr); +uint64_t cpu_mips_phys_to_kseg0(void *opaque, uint64_t addr); + +/* mips_int.c */ +void cpu_mips_irq_init_cpu(CPUState *env); + +/* mips_timer.c */ +void cpu_mips_clock_init(CPUState *); + +#endif diff --git a/hw/mips_int.c b/hw/mips_int.c index 87204ee..c30954c 100644 --- a/hw/mips_int.c +++ b/hw/mips_int.c @@ -21,7 +21,7 @@ */ #include "hw.h" -#include "mips.h" +#include "mips_cpudevs.h" #include "cpu.h" /* Raise IRQ to CPU if necessary. It must be called every time the active diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index e8a81b1..5609597 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -24,6 +24,7 @@ #include "hw.h" #include "mips.h" +#include "mips_cpudevs.h" #include "pc.h" #include "isa.h" #include "fdc.h" diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 96e3bc0..9a35d0c 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -31,6 +31,7 @@ #include "block.h" #include "flash.h" #include "mips.h" +#include "mips_cpudevs.h" #include "pci.h" #include "usb-uhci.h" #include "vmware_vga.h" diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c index 98d1a01..a747de5 100644 --- a/hw/mips_mipssim.c +++ b/hw/mips_mipssim.c @@ -26,6 +26,7 @@ */ #include "hw.h" #include "mips.h" +#include "mips_cpudevs.h" #include "pc.h" #include "isa.h" #include "net.h" diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index c29615c..34b4506 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -9,6 +9,7 @@ */ #include "hw.h" #include "mips.h" +#include "mips_cpudevs.h" #include "pc.h" #include "isa.h" #include "net.h" diff --git a/hw/mips_timer.c b/hw/mips_timer.c index 4e03435..e3beee8 100644 --- a/hw/mips_timer.c +++ b/hw/mips_timer.c @@ -21,7 +21,7 @@ */ #include "hw.h" -#include "mips.h" +#include "mips_cpudevs.h" #include "qemu-timer.h" #define TIMER_FREQ 100 * 1000 * 1000