From patchwork Fri Feb 8 23:17:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 2118971 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 0E5E03FD56 for ; Fri, 8 Feb 2013 23:22:40 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U3xF1-0002TZ-S2; Fri, 08 Feb 2013 23:20:23 +0000 Received: from ducie-dc1.codethink.co.uk ([37.128.190.40]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U3xCo-0001Bb-Ql for linux-arm-kernel@lists.infradead.org; Fri, 08 Feb 2013 23:18:12 +0000 Received: by ducie-dc1.codethink.co.uk (Postfix, from userid 1002) id 8CE7F46C4DB; Fri, 8 Feb 2013 23:18:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ducie-dc1.codethink.co.uk X-Spam-Level: X-Spam-Status: No, score=-2.9 required=6.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.2 Received: from rainbowdash.ducie.codethink.co.uk (rainbowdash.dyn.ducie.codethink.co.uk [192.168.24.216]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPS id B5F6346C574; Fri, 8 Feb 2013 23:18:00 +0000 (GMT) Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.80) (envelope-from ) id 1U3xCj-0006Xx-OP; Fri, 08 Feb 2013 23:18:01 +0000 From: Ben Dooks To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 12/17] ARM: fix magic for bootloader in BE8 Date: Fri, 8 Feb 2013 23:17:42 +0000 Message-Id: <1360365467-25056-13-git-send-email-ben.dooks@codethink.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360365467-25056-1-git-send-email-ben.dooks@codethink.co.uk> References: <1360365467-25056-1-git-send-email-ben.dooks@codethink.co.uk> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130208_181807_018163_4BF4F61E X-CRM114-Status: GOOD ( 12.27 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Ben Dooks X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org If the boot-loader is running little endian and the kernel is compiled big endian then it will not verify the magic number of the front of the kernel. Note, do we need to also reverse the two values after the magic, or are they used later on in the kernel decompressor? Signed-off-by: Ben Dooks --- arch/arm/boot/compressed/head.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 39940a7..b6c7ec8 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -129,7 +129,11 @@ start: THUMB( adr r12, BSYM(1f) ) THUMB( bx r12 ) +#ifdef CONFIG_CPU_BE8_BOOT_LE + .word 0x18286f01 +#else .word 0x016f2818 @ Magic numbers to help the loader +#endif .word start @ absolute load/run zImage address .word _edata @ zImage end address THUMB( .thumb )