From patchwork Fri Oct 26 22:17:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dinh Nguyen X-Patchwork-Id: 1654021 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 53222DFAF2 for ; Fri, 26 Oct 2012 21:19:47 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TRrHx-0006tN-4a; Fri, 26 Oct 2012 21:17:57 +0000 Received: from tx2ehsobe004.messaging.microsoft.com ([65.55.88.14] helo=tx2outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TRrHt-0006t9-2x for linux-arm-kernel@lists.infradead.org; Fri, 26 Oct 2012 21:17:55 +0000 Received: from mail275-tx2-R.bigfish.com (10.9.14.235) by TX2EHSOBE008.bigfish.com (10.9.40.28) with Microsoft SMTP Server id 14.1.225.23; Fri, 26 Oct 2012 21:17:47 +0000 Received: from mail275-tx2 (localhost [127.0.0.1]) by mail275-tx2-R.bigfish.com (Postfix) with ESMTP id 1D7EB178016D; Fri, 26 Oct 2012 21:17:47 +0000 (UTC) X-Forefront-Antispam-Report: CIP:66.35.236.232; KIP:(null); UIP:(null); IPV:NLI; H:SJ-ITEXEDGE02.altera.priv.altera.com; RD:none; EFVD:NLI X-SpamScore: 4 X-BigFish: VS4(zzzz1202h1d1ah1d2ahzz8275bhz32i2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h14ddh1504h1537h10bek1155h) Received: from mail275-tx2 (localhost.localdomain [127.0.0.1]) by mail275-tx2 (MessageSwitch) id 1351286265795727_4168; Fri, 26 Oct 2012 21:17:45 +0000 (UTC) Received: from TX2EHSMHS043.bigfish.com (unknown [10.9.14.241]) by mail275-tx2.bigfish.com (Postfix) with ESMTP id B4A6D1C00046; Fri, 26 Oct 2012 21:17:45 +0000 (UTC) Received: from SJ-ITEXEDGE02.altera.priv.altera.com (66.35.236.232) by TX2EHSMHS043.bigfish.com (10.9.99.143) with Microsoft SMTP Server (TLS) id 14.1.225.23; Fri, 26 Oct 2012 21:17:42 +0000 Received: from sj-mail01.altera.com (137.57.1.6) by SJ-ITEXEDGE02.altera.priv.altera.com (66.35.236.232) with Microsoft SMTP Server id 8.3.279.5; Fri, 26 Oct 2012 14:09:48 -0700 Received: from dinh-ubuntu.altera.com (dinh-ubuntu.altera.com [137.57.188.25] (may be forged)) by sj-mail01.altera.com (8.13.7+Sun/8.13.7) with ESMTP id q9QLHU2w017758; Fri, 26 Oct 2012 14:17:37 -0700 (PDT) From: To: Subject: [PATCH] arm: socfpga: fix build break for allyesconfig Date: Fri, 26 Oct 2012 16:17:41 -0600 Message-ID: <1351289861-16297-1-git-send-email-dinguyen@altera.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: altera.com X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [65.55.88.14 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: thomas.petazzoni@free-electrons.com, linux@arm.linux.org.uk, wd@denx.de, arnd@arndb.de, pavel@denx.de, rob.herring@calxeda.com, atull@altera.com, Dinh Nguyen , dinh.linux@gmail.com, linux-arm-kernel@lists.infradead.org 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: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Dinh Nguyen Add check for armv7 in headsmp.S. Signed-off-by: Dinh Nguyen --- arch/arm/mach-socfpga/headsmp.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S index 17d6eaf..9031a3c 100644 --- a/arch/arm/mach-socfpga/headsmp.S +++ b/arch/arm/mach-socfpga/headsmp.S @@ -15,8 +15,10 @@ #define CPU1_START_ADDR 0xffd08010 ENTRY(secondary_trampoline) +#if __LINUX_ARM_ARCH__ >= 7 movw r0, #:lower16:CPU1_START_ADDR movt r0, #:upper16:CPU1_START_ADDR +#endif ldr r1, [r0] bx r1