From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHeB9-0005cL-Au for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:49:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UHeB7-00079U-SE for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:48:59 -0400 Received: from mail-bk0-x22e.google.com ([2a00:1450:4008:c01::22e]:63165) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHdz1-0002Ai-21 for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:36:27 -0400 Received: by mail-bk0-f46.google.com with SMTP id j5so2684459bkw.33 for ; Mon, 18 Mar 2013 10:36:26 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 18 Mar 2013 18:35:23 +0100 Message-Id: <1363628125-5310-34-git-send-email-pbonzini@redhat.com> In-Reply-To: <1363628125-5310-1-git-send-email-pbonzini@redhat.com> References: <1363628125-5310-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 33/35] arm: move remaining files to hw/arm/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- hw/arm/Makefile.objs | 8 ++++++-- hw/{ => arm}/a15mpcore.c | 0 hw/{ => arm}/a9mpcore.c | 0 hw/{ => arm}/arm11mpcore.c | 0 hw/{ => arm}/strongarm.c | 0 5 files changed, 6 insertions(+), 2 deletions(-) rename hw/{ => arm}/a15mpcore.c (100%) rename hw/{ => arm}/a9mpcore.c (100%) rename hw/{ => arm}/arm11mpcore.c (100%) rename hw/{ => arm}/strongarm.c (100%) diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 9ffb911..66d67d3 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,14 +1,18 @@ +# CPU cores obj-y += arm11mpcore.o a9mpcore.o obj-y += a15mpcore.o + +# All-in-one devices, should be refactored obj-y += strongarm.o -obj-$(CONFIG_KVM) += kvm/arm_gic.o -obj-y := $(addprefix ../,$(obj-y)) +obj-$(CONFIG_KVM) += ../kvm/arm_gic.o +# Boards obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o obj-y += omap_sx1.o palm.o pic_cpu.o realview.o spitz.o stellaris.o obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o +# Devices that require ARMCPU obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-y += omap1.o omap2.o diff --git a/hw/a15mpcore.c b/hw/arm/a15mpcore.c similarity index 100% rename from hw/a15mpcore.c rename to hw/arm/a15mpcore.c diff --git a/hw/a9mpcore.c b/hw/arm/a9mpcore.c similarity index 100% rename from hw/a9mpcore.c rename to hw/arm/a9mpcore.c diff --git a/hw/arm11mpcore.c b/hw/arm/arm11mpcore.c similarity index 100% rename from hw/arm11mpcore.c rename to hw/arm/arm11mpcore.c diff --git a/hw/strongarm.c b/hw/arm/strongarm.c similarity index 100% rename from hw/strongarm.c rename to hw/arm/strongarm.c -- 1.8.1.4