From patchwork Tue Aug 26 08:30:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kpark3469@gmail.com X-Patchwork-Id: 4779011 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0BD739F38C for ; Tue, 26 Aug 2014 08:34:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2CB2E20154 for ; Tue, 26 Aug 2014 08:34:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5D23B201C0 for ; Tue, 26 Aug 2014 08:34:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XMC9g-0001Ji-94; Tue, 26 Aug 2014 08:31:04 +0000 Received: from mail-pa0-x231.google.com ([2607:f8b0:400e:c03::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XMC9e-0001D7-Hg for linux-arm-kernel@lists.infradead.org; Tue, 26 Aug 2014 08:31:03 +0000 Received: by mail-pa0-f49.google.com with SMTP id hz1so22647867pad.36 for ; Tue, 26 Aug 2014 01:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Hi6TYM+6/JYwZEMNWh0ZfQHBKgIxDTr2uqIoczNAUiI=; b=sBBeouhDmJ87YNXH7JmpYgsIyHPaAk2/KNXw0QFVYd+9xcVYt9tnX5T3B8UfjQ3aib K3glpkezBaEceCClLZT56Ky3ypFwn7EmII8VDK+pUQTamtPZ4gh07jeDzsj2JPSmROHO pLQyqByVNWEIQHU8HdOthqmqLJJJHmcdob+EXFNbbvUR5kMjE1dbMnN8WaJG5E82g0S4 Tia4l7QxMps4JSPJomeLqLWczI77JAHPPOrEXW+3so0N/hDMhaT4NlYbqy52RjsPsoCQ KJgDSGaave+fDsEIe0FJV98txtPWnKXOEvjHaCR0IqINIBExiSRWvVydb/duN3HUacv2 H1eg== X-Received: by 10.70.64.166 with SMTP id p6mr12419718pds.139.1409041841780; Tue, 26 Aug 2014 01:30:41 -0700 (PDT) Received: from SEL-KPARK-D2.wrs.com ([61.107.31.52]) by mx.google.com with ESMTPSA id bx6sm7610775pab.48.2014.08.26.01.30.39 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Aug 2014 01:30:41 -0700 (PDT) From: kpark3469@gmail.com To: linux@arm.linux.org.uk Subject: [PATCH] ARM: compressed/head.S: use addruart properly Date: Tue, 26 Aug 2014 17:30:15 +0900 Message-Id: <1409041815-8766-1-git-send-email-kpark3469@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140826_013102_605282_2D6F237F X-CRM114-Status: UNSURE ( 9.67 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.6 (/) Cc: keun-o.park@windriver.com, afzal.mohd.ma@gmail.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sahara This patch fixes compile error in compressed/head.S, when DEBUG is defined. Since addruart macro accepts 3 params, rp, rv, and tmp, loadsp macro also needs to be fixed. Or you will meet the following error messages: Error: ARM register expected -- `mov ,#(5<<1)' Error: shift expression expected -- `add r3,r3,' Signed-off-by: Sahara --- arch/arm/boot/compressed/head.S | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 413fd94..9f1a6cd 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -24,19 +24,19 @@ #if defined(CONFIG_DEBUG_ICEDCC) #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7) - .macro loadsp, rb, tmp + .macro loadsp, rp, rv, tmp .endm .macro writeb, ch, rb mcr p14, 0, \ch, c0, c5, 0 .endm #elif defined(CONFIG_CPU_XSCALE) - .macro loadsp, rb, tmp + .macro loadsp, rp, rv, tmp .endm .macro writeb, ch, rb mcr p14, 0, \ch, c8, c0, 0 .endm #else - .macro loadsp, rb, tmp + .macro loadsp, rp, rv, tmp .endm .macro writeb, ch, rb mcr p14, 0, \ch, c1, c0, 0 @@ -52,17 +52,17 @@ .endm #if defined(CONFIG_ARCH_SA1100) - .macro loadsp, rb, tmp - mov \rb, #0x80000000 @ physical base address + .macro loadsp, rp, rv, tmp + mov \rp, #0x80000000 @ physical base address #ifdef CONFIG_DEBUG_LL_SER3 - add \rb, \rb, #0x00050000 @ Ser3 + add \rp, \rp, #0x00050000 @ Ser3 #else - add \rb, \rb, #0x00010000 @ Ser1 + add \rp, \rp, #0x00010000 @ Ser1 #endif .endm #else - .macro loadsp, rb, tmp - addruart \rb, \tmp + .macro loadsp, rp, rv, tmp + addruart \rp, \rv, \tmp .endm #endif #endif @@ -1209,7 +1209,7 @@ phex: adr r3, phexbuf b 1b @ puts corrupts {r0, r1, r2, r3} -puts: loadsp r3, r1 +puts: loadsp r3, r2, r1 1: ldrb r2, [r0], #1 teq r2, #0 moveq pc, lr @@ -1225,9 +1225,9 @@ puts: loadsp r3, r1 mov pc, lr @ putc corrupts {r0, r1, r2, r3} putc: + loadsp r3, r2, r1 mov r2, r0 mov r0, #0 - loadsp r3, r1 b 2b @ memdump corrupts {r0, r1, r2, r3, r10, r11, r12, lr}