From patchwork Thu Apr 4 19:23:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233928 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1BFB42C0099 for ; Fri, 5 Apr 2013 06:41:09 +1100 (EST) Received: from localhost ([::1]:53752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNq1z-0008Tg-An for incoming@patchwork.ozlabs.org; Thu, 04 Apr 2013 15:41:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNps0-0003Qu-Rr for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:30:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNplo-0002Ev-9f for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:27 -0400 Received: from mail-we0-x234.google.com ([2a00:1450:400c:c03::234]:45335) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNplo-0002CZ-01 for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:24 -0400 Received: by mail-we0-f180.google.com with SMTP id r5so2258089wey.25 for ; Thu, 04 Apr 2013 12:24:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=KpMY4YK4XGYr0Zu/xHwEBEBmQkwv9m/3Qq32xWiV6Fw=; b=XNHL8IZlYnrNTbGfIIYeCy0vlqKQSb7zAzqwsSjym8Cm2liGF/JqbnRzvefsO+/EQo FCviIPZXVcCU/QKVYKbR0hiiQC2DBdrXo2Ov7uoopUoEfWZfRmh+31gqlkE93ro27Nvw LD59MDM+UQSsFaps4+oQ1o4EEtVvxjpWcjx2nqZYUT5ObzYAmXGhU2FphaDQk09yIsw8 XfmnTVDxW23LFvYjBlZ5VB9hWz9nffCwh3DoYrS6eF/L3Z8lkvQlg+/wiBSDIWANfvB2 nN9jCIqUYxgtiwLQO4cIj+fHU5XPL2WYgQvsj3MMf65A14vyAXiGWkhXzWZU5TVsSxMo XyRA== X-Received: by 10.194.122.166 with SMTP id lt6mr6216466wjb.56.1365103463094; Thu, 04 Apr 2013 12:24:23 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id du2sm33093079wib.0.2013.04.04.12.24.21 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Apr 2013 12:24:22 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 4 Apr 2013 21:23:10 +0200 Message-Id: <1365103395-11547-31-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365103395-11547-1-git-send-email-pbonzini@redhat.com> References: <1365103395-11547-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::234 Subject: [Qemu-devel] [PATCH 30/35] hw: move other devices to hw/misc/, configure with default-configs/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 4 ++++ default-configs/i386-softmmu.mak | 3 +++ default-configs/sparc-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 3 +++ hw/arm/Makefile.objs | 11 +---------- hw/i386/Makefile.objs | 4 ---- hw/lm32/Makefile.objs | 7 ------- hw/misc/Makefile.objs | 23 +++++++++++++++++++++++ hw/{ => misc}/a9scu.c | 0 hw/{ => misc}/arm_sysctl.c | 0 hw/{ => misc}/cbus.c | 0 hw/{ => misc}/debugexit.c | 0 hw/{ => misc}/eccmemctl.c | 0 hw/{ => misc}/exynos4210_pmu.c | 0 hw/{ => misc}/imx_ccm.c | 0 hw/{ => misc}/lm32_sys.c | 0 hw/{ => misc}/milkymist-hpdmc.c | 0 hw/{ => misc}/milkymist-pfpu.c | 0 hw/{ => misc}/mst_fpga.c | 0 hw/{ => misc}/omap_clk.c | 0 hw/{ => misc}/omap_gpmc.c | 0 hw/{ => misc}/omap_l4.c | 0 hw/{ => misc}/omap_sdrc.c | 0 hw/{ => misc}/omap_tap.c | 0 hw/{ => misc}/pc-testdev.c | 0 hw/{ => misc}/pxa2xx_pcmcia.c | 0 hw/{ => misc}/sga.c | 0 hw/{ => misc}/slavio_misc.c | 0 hw/{ => misc}/vmport.c | 0 hw/{ => misc}/zynq_slcr.c | 0 hw/sparc/Makefile.objs | 5 ----- 31 files changed, 35 insertions(+), 26 deletions(-) rename hw/{ => misc}/a9scu.c (100%) rename hw/{ => misc}/arm_sysctl.c (100%) rename hw/{ => misc}/cbus.c (100%) rename hw/{ => misc}/debugexit.c (100%) rename hw/{ => misc}/eccmemctl.c (100%) rename hw/{ => misc}/exynos4210_pmu.c (100%) rename hw/{ => misc}/imx_ccm.c (100%) rename hw/{ => misc}/lm32_sys.c (100%) rename hw/{ => misc}/milkymist-hpdmc.c (100%) rename hw/{ => misc}/milkymist-pfpu.c (100%) rename hw/{ => misc}/mst_fpga.c (100%) rename hw/{ => misc}/omap_clk.c (100%) rename hw/{ => misc}/omap_gpmc.c (100%) rename hw/{ => misc}/omap_l4.c (100%) rename hw/{ => misc}/omap_sdrc.c (100%) rename hw/{ => misc}/omap_tap.c (100%) rename hw/{ => misc}/pc-testdev.c (100%) rename hw/{ => misc}/pxa2xx_pcmcia.c (100%) rename hw/{ => misc}/sga.c (100%) rename hw/{ => misc}/slavio_misc.c (100%) rename hw/{ => misc}/vmport.c (100%) rename hw/{ => misc}/zynq_slcr.c (100%) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 93c7d95..e03840e 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -58,6 +58,7 @@ CONFIG_BITBANG_I2C=y CONFIG_FRAMEBUFFER=y CONFIG_XILINX_SPIPS=y +CONFIG_A9SCU=y CONFIG_MARVELL_88W8618=y CONFIG_OMAP=y CONFIG_TSC210X=y @@ -65,8 +66,11 @@ CONFIG_BLIZZARD=y CONFIG_ONENAND=y CONFIG_TUSB6010=y CONFIG_IMX=y +CONFIG_MAINSTONE=y +CONFIG_NSERIES=y CONFIG_REALVIEW=y CONFIG_ZAURUS=y +CONFIG_ZYNQ=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 79851bd..4ac0694 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -38,6 +38,9 @@ CONFIG_WDT_IB700=y CONFIG_PC_SYSFW=y CONFIG_XEN_I386=$(CONFIG_XEN) CONFIG_ISA_DEBUG=y +CONFIG_ISA_TESTDEV=y +CONFIG_VMPORT=y +CONFIG_SGA=y CONFIG_LPC_ICH9=y CONFIG_Q35=y CONFIG_APIC=y diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index 8c4d0a6..8fc93dd 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -14,4 +14,5 @@ CONFIG_SLAVIO=y CONFIG_CS4231=y CONFIG_GRLIB=y CONFIG_STP2000=y +CONFIG_ECCMEMCTL=y CONFIG_SUN4M=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 176f493..bf4091c 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -38,6 +38,9 @@ CONFIG_WDT_IB700=y CONFIG_PC_SYSFW=y CONFIG_XEN_I386=$(CONFIG_XEN) CONFIG_ISA_DEBUG=y +CONFIG_ISA_TESTDEV=y +CONFIG_VMPORT=y +CONFIG_SGA=y CONFIG_LPC_ICH9=y CONFIG_Q35=y CONFIG_APIC=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index ec4d0cb..cb94927 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,15 +1,6 @@ -obj-y += zynq_slcr.o -obj-y += a9scu.o -obj-y += arm_sysctl.o arm11mpcore.o a9mpcore.o -obj-y += exynos4210_pmu.o +obj-y += arm11mpcore.o a9mpcore.o obj-y += a15mpcore.o -obj-y += pxa2xx_pcmcia.o -obj-y += omap_clk.o -obj-y += omap_gpmc.o omap_sdrc.o omap_tap.o omap_l4.o -obj-y += cbus.o -obj-y += mst_fpga.o obj-y += strongarm.o -obj-y += imx_ccm.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 533d337..c1d73a8 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -1,8 +1,4 @@ -obj-y += sga.o -obj-y += vmport.o -obj-y += debugexit.o obj-y += kvm/ -obj-y += pc-testdev.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs index 1e59ac5..ea6418a 100644 --- a/hw/lm32/Makefile.objs +++ b/hw/lm32/Makefile.objs @@ -1,10 +1,3 @@ -# LM32 peripherals -obj-y += lm32_sys.o -obj-y += milkymist-hpdmc.o -obj-y += milkymist-pfpu.o - -obj-y := $(addprefix ../,$(obj-y)) - # LM32 boards obj-y += lm32_boards.o obj-y += milkymist.o diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 9b1ab39..03699c3 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -1,6 +1,11 @@ common-obj-$(CONFIG_APPLESMC) += applesmc.o common-obj-$(CONFIG_MAX111X) += max111x.o common-obj-$(CONFIG_TMP105) += tmp105.o +common-obj-$(CONFIG_ISA_DEBUG) += debugexit.o +common-obj-$(CONFIG_SGA) += sga.o +common-obj-$(CONFIG_ISA_TESTDEV) += pc-testdev.o + +obj-$(CONFIG_VMPORT) += vmport.o # ARM devices common-obj-$(CONFIG_PL310) += arm_l2x0.o @@ -15,3 +20,21 @@ obj-$(CONFIG_KVM) += ivshmem.o obj-$(CONFIG_LINUX) += vfio.o endif +obj-$(CONFIG_REALVIEW) += arm_sysctl.o +obj-$(CONFIG_A9SCU) += a9scu.o +obj-$(CONFIG_NSERIES) += cbus.o +obj-$(CONFIG_ECCMEMCTL) += eccmemctl.o +obj-$(CONFIG_EXYNOS4) += exynos4210_pmu.o +obj-$(CONFIG_IMX) += imx_ccm.o +obj-$(CONFIG_LM32) += lm32_sys.o +obj-$(CONFIG_MILKYMIST) += milkymist-hpdmc.o +obj-$(CONFIG_MILKYMIST) += milkymist-pfpu.o +obj-$(CONFIG_MAINSTONE) += mst_fpga.o +obj-$(CONFIG_OMAP) += omap_clk.o +obj-$(CONFIG_OMAP) += omap_gpmc.o +obj-$(CONFIG_OMAP) += omap_l4.o +obj-$(CONFIG_OMAP) += omap_sdrc.o +obj-$(CONFIG_OMAP) += omap_tap.o +obj-$(CONFIG_PXA2XX) += pxa2xx_pcmcia.o +obj-$(CONFIG_SLAVIO) += slavio_misc.o +obj-$(CONFIG_ZYNQ) += zynq_slcr.o diff --git a/hw/a9scu.c b/hw/misc/a9scu.c similarity index 100% rename from hw/a9scu.c rename to hw/misc/a9scu.c diff --git a/hw/arm_sysctl.c b/hw/misc/arm_sysctl.c similarity index 100% rename from hw/arm_sysctl.c rename to hw/misc/arm_sysctl.c diff --git a/hw/cbus.c b/hw/misc/cbus.c similarity index 100% rename from hw/cbus.c rename to hw/misc/cbus.c diff --git a/hw/debugexit.c b/hw/misc/debugexit.c similarity index 100% rename from hw/debugexit.c rename to hw/misc/debugexit.c diff --git a/hw/eccmemctl.c b/hw/misc/eccmemctl.c similarity index 100% rename from hw/eccmemctl.c rename to hw/misc/eccmemctl.c diff --git a/hw/exynos4210_pmu.c b/hw/misc/exynos4210_pmu.c similarity index 100% rename from hw/exynos4210_pmu.c rename to hw/misc/exynos4210_pmu.c diff --git a/hw/imx_ccm.c b/hw/misc/imx_ccm.c similarity index 100% rename from hw/imx_ccm.c rename to hw/misc/imx_ccm.c diff --git a/hw/lm32_sys.c b/hw/misc/lm32_sys.c similarity index 100% rename from hw/lm32_sys.c rename to hw/misc/lm32_sys.c diff --git a/hw/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c similarity index 100% rename from hw/milkymist-hpdmc.c rename to hw/misc/milkymist-hpdmc.c diff --git a/hw/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c similarity index 100% rename from hw/milkymist-pfpu.c rename to hw/misc/milkymist-pfpu.c diff --git a/hw/mst_fpga.c b/hw/misc/mst_fpga.c similarity index 100% rename from hw/mst_fpga.c rename to hw/misc/mst_fpga.c diff --git a/hw/omap_clk.c b/hw/misc/omap_clk.c similarity index 100% rename from hw/omap_clk.c rename to hw/misc/omap_clk.c diff --git a/hw/omap_gpmc.c b/hw/misc/omap_gpmc.c similarity index 100% rename from hw/omap_gpmc.c rename to hw/misc/omap_gpmc.c diff --git a/hw/omap_l4.c b/hw/misc/omap_l4.c similarity index 100% rename from hw/omap_l4.c rename to hw/misc/omap_l4.c diff --git a/hw/omap_sdrc.c b/hw/misc/omap_sdrc.c similarity index 100% rename from hw/omap_sdrc.c rename to hw/misc/omap_sdrc.c diff --git a/hw/omap_tap.c b/hw/misc/omap_tap.c similarity index 100% rename from hw/omap_tap.c rename to hw/misc/omap_tap.c diff --git a/hw/pc-testdev.c b/hw/misc/pc-testdev.c similarity index 100% rename from hw/pc-testdev.c rename to hw/misc/pc-testdev.c diff --git a/hw/pxa2xx_pcmcia.c b/hw/misc/pxa2xx_pcmcia.c similarity index 100% rename from hw/pxa2xx_pcmcia.c rename to hw/misc/pxa2xx_pcmcia.c diff --git a/hw/sga.c b/hw/misc/sga.c similarity index 100% rename from hw/sga.c rename to hw/misc/sga.c diff --git a/hw/slavio_misc.c b/hw/misc/slavio_misc.c similarity index 100% rename from hw/slavio_misc.c rename to hw/misc/slavio_misc.c diff --git a/hw/vmport.c b/hw/misc/vmport.c similarity index 100% rename from hw/vmport.c rename to hw/misc/vmport.c diff --git a/hw/zynq_slcr.c b/hw/misc/zynq_slcr.c similarity index 100% rename from hw/zynq_slcr.c rename to hw/misc/zynq_slcr.c diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs index 3246bb1..c987b5b 100644 --- a/hw/sparc/Makefile.objs +++ b/hw/sparc/Makefile.objs @@ -1,6 +1 @@ -obj-y += slavio_misc.o -obj-y += eccmemctl.o - -obj-y := $(addprefix ../,$(obj-y)) - obj-y += sun4m.o leon3.o