From patchwork Tue Jul 8 12:13:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 33354 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 74E07208CF for ; Thu, 10 Jul 2014 01:56:23 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id b6sf32716592yha.0 for ; Wed, 09 Jul 2014 18:56:22 -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:in-reply-to:references: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=hrrusdX2Tj+7eCzxMUVAm7c+7OCZMeXG/AUbqaqzMpk=; b=Plejf1xUW8hkarrfc3EJhwI+LrvOCgJyFYee6RkFAjQrNIUJPU3G+DetVlxdl67g9R 9JBC8k6noxYFuS9bYMMPA6XTmT3T4ranrSsdjZyGYdZrG01yk8+w6RPu2NV9w+ahaftV 2se54ciAUR/BwtfGAbbywclgUd9XKSJu8+UETvk6QIBP4LQdFhB07/LsZmcl+zpM1z/j AH0H8gdojjYVFJRq9qMBXjWZnfrC5Zmx0DvPhRRAd86kaOOI+wuwW3vexvEHHoKTHJM+ 1VQNM3WOg23Vxcm78N6hl4Lpo3a8ht93Wx84ZtakaWXpI4cWpAthCukRE2LNSE4jzc95 MERw== X-Gm-Message-State: ALoCoQnncH04UAhC3EA2QmukoV8m3SQ9/fyBgcrnfxLlhkzR218ts4qxPIUi92AQi9z2RMrPX1HQ X-Received: by 10.52.231.97 with SMTP id tf1mr18787348vdc.3.1404957382916; Wed, 09 Jul 2014 18:56:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.97.198 with SMTP id m64ls2712138qge.39.gmail; Wed, 09 Jul 2014 18:56:22 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr42466501vcb.0.1404957382754; Wed, 09 Jul 2014 18:56:22 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id fj4si22361696vcb.24.2014.07.09.18.56.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Jul 2014 18:56:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id lf12so9244509vcb.32 for ; Wed, 09 Jul 2014 18:56:22 -0700 (PDT) X-Received: by 10.220.162.74 with SMTP id u10mr548686vcx.32.1404957382642; Wed, 09 Jul 2014 18:56:22 -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 tc5csp93161vcb; Wed, 9 Jul 2014 18:56:22 -0700 (PDT) X-Received: by 10.224.126.70 with SMTP id b6mr78789218qas.74.1404957382207; Wed, 09 Jul 2014 18:56:22 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a91si48526106qga.53.2014.07.09.18.56.22 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 09 Jul 2014 18:56:22 -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]:35078 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X53av-00031F-Sm for patch@linaro.org; Wed, 09 Jul 2014 21:56:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4UHC-000362-9J for qemu-devel@nongnu.org; Tue, 08 Jul 2014 08:13:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4UHB-00087t-5y for qemu-devel@nongnu.org; Tue, 08 Jul 2014 08:13:38 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48795) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4UHA-00086v-W9 for qemu-devel@nongnu.org; Tue, 08 Jul 2014 08:13:37 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1X4UH3-0003Gg-19 for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:13:29 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 8 Jul 2014 13:13:27 +0100 Message-Id: <1404821608-12529-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1404821608-12529-1-git-send-email-peter.maydell@linaro.org> References: <1404821608-12529-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 2/3] 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.220.173 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 Message-id: 1404310070-3561-1-git-send-email-peter.maydell@linaro.org Reviewed-by: Greg Bellows --- 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[] = {