From patchwork Wed Feb 15 18:21:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 6806 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 0787123DE1 for ; Wed, 15 Feb 2012 18:22:34 +0000 (UTC) Received: from mail-gx0-f180.google.com (mail-gx0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id C1AD5A189B1 for ; Wed, 15 Feb 2012 18:22:34 +0000 (UTC) Received: by ggnr1 with SMTP id r1so1036252ggn.11 for ; Wed, 15 Feb 2012 10:22:34 -0800 (PST) Received: by 10.50.203.6 with SMTP id km6mr44111168igc.25.1329330154173; Wed, 15 Feb 2012 10:22:34 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.80.19 with SMTP id r19cs2754ibk; Wed, 15 Feb 2012 10:22:33 -0800 (PST) Received: by 10.180.95.105 with SMTP id dj9mr36799672wib.18.1329330152887; Wed, 15 Feb 2012 10:22:32 -0800 (PST) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id y50si3152718wec.75.2012.02.15.10.22.31 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Feb 2012 10:22:32 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) smtp.mail=dave.martin@linaro.org Received: by mail-we0-f178.google.com with SMTP id b12so1120243wer.37 for ; Wed, 15 Feb 2012 10:22:31 -0800 (PST) MIME-Version: 1.0 Received: by 10.180.79.229 with SMTP id m5mr37008714wix.6.1329330151782; Wed, 15 Feb 2012 10:22:31 -0800 (PST) Received: from localhost.localdomain ([213.123.120.124]) by mx.google.com with ESMTPS id ga1sm11784894wib.5.2012.02.15.10.22.22 (version=SSLv3 cipher=OTHER); Wed, 15 Feb 2012 10:22:31 -0800 (PST) From: Dave Martin To: Rusty Russell Cc: patches@linaro.org, Peter Maydell , Marc Zyngier , Dave Martin Subject: [PATCH 2/2] boot-wrapper: Fix typo'd load of the vector base address Date: Wed, 15 Feb 2012 18:21:38 +0000 Message-Id: <1329330098-31636-3-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1329330098-31636-1-git-send-email-dave.martin@linaro.org> References: <1329330098-31636-1-git-send-email-dave.martin@linaro.org> X-Gm-Message-State: ALoCoQm2T4Un8BmS+gK5yJPqQy+nTq4Ci0we+I0JfV+MYL+jlU0BNF3wpZdWp0rBomXYGwxNt8/m The contents of the first vector is accidentally set as the hyp vector base address. Ths patch fixes the code to load the address of the first vector instead. Signed-off-by: Dave Martin --- boot.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/boot.S b/boot.S index de50cdc..ecabe33 100644 --- a/boot.S +++ b/boot.S @@ -109,7 +109,7 @@ _start: mcr p15, 0, r0, c12, c0, 1 @ Monitor vector base address @ Set up hvbar so hvc comes back here. - ldr r0, vectors + ldr r0, =vectors mov r7, #0xfffffff0 smc #0 @ Set HVBAR