From patchwork Mon Jun 20 13:40:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 2086 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 978BD23F4D for ; Mon, 20 Jun 2011 13:40:42 +0000 (UTC) Received: from mail-vw0-f52.google.com (mail-vw0-f52.google.com [209.85.212.52]) by fiordland.canonical.com (Postfix) with ESMTP id 5F819A1875E for ; Mon, 20 Jun 2011 13:40:42 +0000 (UTC) Received: by mail-vw0-f52.google.com with SMTP id 16so3501381vws.11 for ; Mon, 20 Jun 2011 06:40:42 -0700 (PDT) Received: by 10.52.175.197 with SMTP id cc5mr3496984vdc.287.1308577242153; Mon, 20 Jun 2011 06:40:42 -0700 (PDT) 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.52.183.130 with SMTP id em2cs5221vdc; Mon, 20 Jun 2011 06:40:42 -0700 (PDT) Received: by 10.216.140.138 with SMTP id e10mr2096618wej.41.1308577241395; Mon, 20 Jun 2011 06:40:41 -0700 (PDT) Received: from mail-wy0-f178.google.com (mail-wy0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id f16si12858456wed.3.2011.06.20.06.40.40 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Jun 2011 06:40:41 -0700 (PDT) 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-wy0-f178.google.com with SMTP id 21so1988565wya.37 for ; Mon, 20 Jun 2011 06:40:40 -0700 (PDT) Received: by 10.216.173.14 with SMTP id u14mr1474357wel.38.1308577240444; Mon, 20 Jun 2011 06:40:40 -0700 (PDT) Received: from e200948.peterhouse.linaro.org (fw-lnat.cambridge.arm.com [217.140.96.63]) by mx.google.com with ESMTPS id fr17sm2359178wbb.40.2011.06.20.06.40.39 (version=SSLv3 cipher=OTHER); Mon, 20 Jun 2011 06:40:39 -0700 (PDT) From: Dave Martin To: linux-arm-kernel@lists.infradead.org Cc: patches@linaro.org, Nicolas Pitre Subject: [PATCH 3/4] ARM: zImage: Jump to the decompressed kernel entry point in ARM state Date: Mon, 20 Jun 2011 14:40:28 +0100 Message-Id: <1308577229-23681-4-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1308577229-23681-1-git-send-email-dave.martin@linaro.org> References: <1308577229-23681-1-git-send-email-dave.martin@linaro.org> This change is required in order to enter the kernel correctly now that the main kernel entry point expects to be called in ARM state. Signed-off-by: Dave Martin --- arch/arm/boot/compressed/head.S | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index f9da419..51af709 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -353,7 +353,8 @@ not_relocated: mov r0, #0 mov r0, #0 @ must be zero mov r1, r7 @ restore architecture number mov r2, r8 @ restore atags pointer - mov pc, r4 @ call kernel + ARM( mov pc, r4 ) @ call kernel + THUMB( bx r4 ) @ entry point is always ARM .align 2 .type LC0, #object