From patchwork Fri Aug 9 13:50:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18916 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f71.google.com (mail-qe0-f71.google.com [209.85.128.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 837AB25A57 for ; Fri, 9 Aug 2013 13:50:21 +0000 (UTC) Received: by mail-qe0-f71.google.com with SMTP id 1sf5157575qee.10 for ; Fri, 09 Aug 2013 06:50:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=dW4EfmOL/cTtFkGW86vErtBfZITArOkvyeGr1qJGD34=; b=P8yLeFiKu9IwScPl0w/Lc3TEru4NVSCtU1IcNZ2TE88sh5XAtnk7IudArfuYwn+j6i p88jVy5ILW8ga8jVegzuX+uNI+zaC3zjs6CkL4g/+ktdCxuxAarARFLgSF6qZxhCp7BO ODPI4ZDZ5QrHOt94d2MCtp4gtNnMZGm/w68Ti90vl6mcOjtQXDZSC3vzJHuSKUGr3zxA nAr+WyTLSuw2SVX+go6+z/veBUoxCQOuYiWenvVp22CoBXkxc+3vstSQQ60Vw7GotIoa AqxZWgJv73/k2iyfQqnyPtnu7cPBWmVNyH0gLXsx5yQKu09I64tjuWlOroTKiO+wDbnZ mN0Q== X-Received: by 10.236.51.225 with SMTP id b61mr5498722yhc.4.1376056221008; Fri, 09 Aug 2013 06:50:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.99.10 with SMTP id em10ls1416417qeb.82.gmail; Fri, 09 Aug 2013 06:50:20 -0700 (PDT) X-Received: by 10.58.19.162 with SMTP id g2mr5946441vee.12.1376056220908; Fri, 09 Aug 2013 06:50:20 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id ur15si4643427veb.70.2013.08.09.06.50.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 Aug 2013 06:50:20 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id pa12so3948222veb.2 for ; Fri, 09 Aug 2013 06:50:20 -0700 (PDT) X-Gm-Message-State: ALoCoQm/wCE0xLHrJEVKwzIW0PapYXvo5F97NYwewVhKzfuKKIH3NJ9eMuHk68uQVHadsaHxum+I X-Received: by 10.52.109.69 with SMTP id hq5mr4929811vdb.85.1376056220776; Fri, 09 Aug 2013 06:50:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp74609vcz; Fri, 9 Aug 2013 06:50:20 -0700 (PDT) X-Received: by 10.14.200.132 with SMTP id z4mr13307853een.14.1376056219539; Fri, 09 Aug 2013 06:50:19 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id w4si15815706eex.87.2013.08.09.06.50.18 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 09 Aug 2013 06:50:19 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1V7n55-0006s8-SH; Fri, 09 Aug 2013 14:50:15 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Paolo Bonzini Subject: [PATCH] default-configs: Fix A9MP and A15MP config names Date: Fri, 9 Aug 2013 14:50:15 +0100 Message-Id: <1376056215-26391-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , When individual CONFIG_ switches for the A9MPcore and A15MPcore devices were created, they were inadvertently given incorrect names (CONFIG_ARM9MPCORE and CONFIG_ARM15MPCORE). These CPUs are "Cortex-A9MP" and "Cortex-A15MP", and in particular the ARM9 is a different (rather older) CPU than the Cortex-A9. Rename the CONFIG_ switches to bring them into line with the source file names and CPU names. Signed-off-by: Peter Maydell --- default-configs/arm-softmmu.mak | 4 ++-- hw/cpu/Makefile.objs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 27cbe3d..ac0815d 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -34,9 +34,9 @@ CONFIG_PFLASH_CFI02=y CONFIG_MICRODRIVE=y CONFIG_USB_MUSB=y -CONFIG_ARM9MPCORE=y CONFIG_ARM11MPCORE=y -CONFIG_ARM15MPCORE=y +CONFIG_A9MPCORE=y +CONFIG_A15MPCORE=y CONFIG_ARM_GIC=y CONFIG_ARM_GIC_KVM=$(CONFIG_KVM) diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs index 4461ece..df287c1 100644 --- a/hw/cpu/Makefile.objs +++ b/hw/cpu/Makefile.objs @@ -1,5 +1,5 @@ obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o -obj-$(CONFIG_ARM9MPCORE) += a9mpcore.o -obj-$(CONFIG_ARM15MPCORE) += a15mpcore.o +obj-$(CONFIG_A9MPCORE) += a9mpcore.o +obj-$(CONFIG_A15MPCORE) += a15mpcore.o obj-$(CONFIG_ICC_BUS) += icc_bus.o