From patchwork Tue Apr 2 14:59:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233039 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 AE6192C014B for ; Wed, 3 Apr 2013 02:03:20 +1100 (EST) Received: from localhost ([::1]:43748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2k2-0001o8-Ow for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 11:03:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2hA-0006NG-1U for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:00:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN2h8-0001nK-NB for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:00:19 -0400 Received: from mail-ea0-x22d.google.com ([2a00:1450:4013:c01::22d]:59022) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2h8-0001nC-E5 for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:00:18 -0400 Received: by mail-ea0-f173.google.com with SMTP id k11so264998eaj.4 for ; Tue, 02 Apr 2013 08:00:17 -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=nrVKGPPU1f2wQ82z4CBBgex02uy2JbrEapoIPta5iDo=; b=KRtzencBiCgUzthQtIR4QxiPkJCkmFd8gt91ePP8yMWdampI49xZenAw2ijpAYy9E2 zmMRCrkqF0/0VD9GlAya5Ivr4gAXIEVVeozF2AIJPEj3cmNmvcLggIW/FrZVBek33TjQ eUnJzGcdxc10KUfiBaX9AEWlho07z+kRM7rPyt2m0itdr6cPNGfZn4Z0Ow0SI7Cown49 lu1uJ80RcqhekA214aSH03UEwohIbld6NNLKJAi2H1RudvV/rEZ94Rzl2GU2o5SzhX7k t+Ri2GWMjz/c7q3L7jn3BtBGlqANqI5ZJYRRTmJUWA2JW9AXZUSDqDQq4xPOctxODdQD pm3A== X-Received: by 10.15.81.136 with SMTP id x8mr50194287eey.9.1364914817594; Tue, 02 Apr 2013 08:00:17 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id n2sm3179353eeo.10.2013.04.02.08.00.15 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 08:00:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2013 16:59:04 +0200 Message-Id: <1364914749-11141-31-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> References: <1364914749-11141-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:4013:c01::22d Subject: [Qemu-devel] [PATCH 30/35] hw: move ARM CPU cores to hw/cpu/, 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 ++++ hw/arm/Makefile.objs | 2 -- hw/{ => cpu}/a15mpcore.c | 0 hw/{ => cpu}/a9mpcore.c | 0 hw/{ => cpu}/arm11mpcore.c | 0 5 files changed, 4 insertions(+), 2 deletions(-) rename hw/{ => cpu}/a15mpcore.c (100%) rename hw/{ => cpu}/a9mpcore.c (100%) rename hw/{ => cpu}/arm11mpcore.c (100%) diff --git a/hw/a15mpcore.c b/hw/cpu/a15mpcore.c similarity index 100% rename from hw/a15mpcore.c rename to hw/cpu/a15mpcore.c diff --git a/hw/a9mpcore.c b/hw/cpu/a9mpcore.c similarity index 100% rename from hw/a9mpcore.c rename to hw/cpu/a9mpcore.c diff --git a/hw/arm11mpcore.c b/hw/cpu/arm11mpcore.c similarity index 100% rename from hw/arm11mpcore.c rename to hw/cpu/arm11mpcore.c diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index e03840e..31725a9 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -34,6 +34,10 @@ CONFIG_PFLASH_CFI02=y CONFIG_MICRODRIVE=y CONFIG_USB_MUSB=y +CONFIG_ARM5MPCORE=y +CONFIG_ARM9MPCORE=y +CONFIG_ARM15MPCORE=y + CONFIG_ARM_GIC=y CONFIG_ARM_GIC_KVM=$(CONFIG_KVM) CONFIG_ARM_TIMER=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index cb94927..35c5f11 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,5 +1,3 @@ -obj-y += arm11mpcore.o a9mpcore.o -obj-y += a15mpcore.o obj-y += strongarm.o obj-y := $(addprefix ../,$(obj-y))