From patchwork Wed Jul 2 14:07:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 32985 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EED5820672 for ; Wed, 2 Jul 2014 14:08:33 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id rd3sf58418898pab.11 for ; Wed, 02 Jul 2014 07:08:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list; bh=2ViTBRzDFx0ffKJgt+BMMOWj+q9/hROSN8MqOoiQgA8=; b=EqZJxLbIy5wkduI/E3OAIbfw5WPmhb1LKEtALOq0xkMtqdA57cPckI/4W0Bk7FHEjD TMPSCpwb//zjqvS7Y6EaJKy4VktljHPT/K6Ysp4hY84tbexKUzCoPISM95txpqpPKViE JJ4XHu/Am3VKantF6nug47eo2wseMjCRsARoER6CQsV2LwyJ+AgCLJUjU7i2Pnx+gEM6 60uA9Lhg0ukwDwOfJ8NRIcHwe3SEU6JUqxW5up1CcAS6fwE5XKJ0cIUB6BKor+uF+9z9 jhgLoZjlebIsY/6UNhf4B2nBulirl+9+pqwbmVxrCeirEmhiAN5+P1R5kNagMlrDsW+P XHIg== X-Gm-Message-State: ALoCoQmMUsTvJxlnFM9kgK7Kn3gHhUOC8oOtyeg6SgL++eBh1M22BPBfH9T5hGl2+8qqE03DR3+6 X-Received: by 10.66.165.165 with SMTP id yz5mr1718023pab.37.1404310112960; Wed, 02 Jul 2014 07:08:32 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.239 with SMTP id l102ls66939qgd.81.gmail; Wed, 02 Jul 2014 07:08:32 -0700 (PDT) X-Received: by 10.220.190.197 with SMTP id dj5mr49245277vcb.19.1404310112839; Wed, 02 Jul 2014 07:08:32 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id gu7si12925995vdc.22.2014.07.02.07.08.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Jul 2014 07:08:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.172 as permitted sender) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id jz11so11362051veb.3 for ; Wed, 02 Jul 2014 07:08:32 -0700 (PDT) X-Received: by 10.52.23.71 with SMTP id k7mr41678342vdf.27.1404310112775; Wed, 02 Jul 2014 07:08:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp295918vcb; Wed, 2 Jul 2014 07:08:32 -0700 (PDT) X-Received: by 10.224.104.10 with SMTP id m10mr84243495qao.27.1404310112362; Wed, 02 Jul 2014 07:08:32 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t9si673434qai.120.2014.07.02.07.08.32 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 02 Jul 2014 07:08:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:53324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X2LD5-0000QS-Qt for patch@linaro.org; Wed, 02 Jul 2014 10:08:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X2LCZ-0008OE-BL for qemu-devel@nongnu.org; Wed, 02 Jul 2014 10:08:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X2LCY-00014O-Cz for qemu-devel@nongnu.org; Wed, 02 Jul 2014 10:07:59 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X2LCY-0000nM-60 for qemu-devel@nongnu.org; Wed, 02 Jul 2014 10:07:58 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1X2LCR-0000vw-0C; Wed, 02 Jul 2014 15:07:51 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Wed, 2 Jul 2014 15:07:50 +0100 Message-Id: <1404310070-3561-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Christoffer Dall , Greg Bellows Subject: [Qemu-devel] [PATCH for-2.1] hw/arm/vexpress: Alias NOR flash at 0 for vexpress-a9 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Make the vexpress-a9 board alias the first NOR flash region at address zero, like vexpress-a15. This makes "-bios" actually usable on this board. Signed-off-by: Peter Maydell Reviewed-by: Greg Bellows --- Looking back through the archives to 2012 when the vexpress-a15 flash alias went in, I seem to have been under the impression that the A9 daughterboard didn't have a similar alias, but it does. (For both boards, there is a mechanism for letting the guest dynamically remap lowmem which we don't implement; the rationale for defaulting to flash at 0 holds for both.) This is a fairly long standing bug but it's more interesting now we support -bios on this board which is a new-in-2.1 thing. Hence the for-2.1 tag. --- hw/arm/vexpress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 3d83e6c..a88732c 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -84,6 +84,7 @@ enum { }; static hwaddr motherboard_legacy_map[] = { + [VE_NORFLASHALIAS] = 0, /* CS7: 0x10000000 .. 0x10020000 */ [VE_SYSREGS] = 0x10000000, [VE_SP810] = 0x10001000, @@ -114,7 +115,6 @@ static hwaddr motherboard_legacy_map[] = { [VE_VIDEORAM] = 0x4c000000, [VE_ETHERNET] = 0x4e000000, [VE_USB] = 0x4f000000, - [VE_NORFLASHALIAS] = -1, /* not present */ }; static hwaddr motherboard_aseries_map[] = {