From patchwork Fri Feb 8 11:44:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 2115421 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 4EF313FD56 for ; Fri, 8 Feb 2013 11:47:38 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U3mOR-0003Yg-BS; Fri, 08 Feb 2013 11:45:23 +0000 Received: from co1ehsobe001.messaging.microsoft.com ([216.32.180.184] helo=co1outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U3mOO-0003Xa-9m for linux-arm-kernel@lists.infradead.org; Fri, 08 Feb 2013 11:45:21 +0000 Received: from mail163-co1-R.bigfish.com (10.243.78.215) by CO1EHSOBE035.bigfish.com (10.243.66.100) with Microsoft SMTP Server id 14.1.225.23; Fri, 8 Feb 2013 11:45:16 +0000 Received: from mail163-co1 (localhost [127.0.0.1]) by mail163-co1-R.bigfish.com (Postfix) with ESMTP id 7B78F22022C; Fri, 8 Feb 2013 11:45:16 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275ch8275dhz2dh87h2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1155h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail163-co1 (localhost.localdomain [127.0.0.1]) by mail163-co1 (MessageSwitch) id 1360323914244611_3240; Fri, 8 Feb 2013 11:45:14 +0000 (UTC) Received: from CO1EHSMHS029.bigfish.com (unknown [10.243.78.214]) by mail163-co1.bigfish.com (Postfix) with ESMTP id 2F252200059; Fri, 8 Feb 2013 11:45:14 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO1EHSMHS029.bigfish.com (10.243.66.39) with Microsoft SMTP Server (TLS) id 14.1.225.23; Fri, 8 Feb 2013 11:45:14 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.2.318.3; Fri, 8 Feb 2013 11:45:13 +0000 Received: from S2101-09.ap.freescale.net ([10.192.185.145]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r18Bj9dm016977; Fri, 8 Feb 2013 04:45:10 -0700 From: Shawn Guo To: Russell King Subject: [PATCH v3 2/2] ARM: uncompress debug support for multiplatform build Date: Fri, 8 Feb 2013 19:44:52 +0800 Message-ID: <1360323892-2860-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <20130206093236.GD17833@n2100.arm.linux.org.uk> References: <20130206093236.GD17833@n2100.arm.linux.org.uk> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130208_064520_473947_EA8529B0 X-CRM114-Status: GOOD ( 12.86 ) 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.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [216.32.180.184 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org, Shawn Guo 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 Instead of giving zero support of uncompress debug for multiplatform build, the patch turns uncompress debug into one part of DEBUG_LL support. When DEBUG_LL is turned on for a particular platform, uncompress debug works too for that platform. It reuses the platform DEBUG_LL macros by creating a simple arch/arm/boot/compressed/debug.S with CONFIG_DEBUG_LL_INCLUDE included there, and implements a generic putc() using those macros. Signed-off-by: Shawn Guo Acked-by: Olof Johansson --- Changes since v2: * Build arch/arm/boot/compressed/debug.S only for multiplatform kernel to fix the breakage on traditional platform build * Include asm/assembler.h in arch/arm/boot/compressed/debug.S, as it may commonly be needed by platforms to be converted to multiplatform Russell, I will put it into patch system if I do not receive any comment tomorrow. Shawn arch/arm/boot/compressed/Makefile | 5 +++++ arch/arm/boot/compressed/debug.S | 12 ++++++++++++ arch/arm/include/debug/uncompress.h | 4 ++++ 3 files changed, 21 insertions(+) create mode 100644 arch/arm/boot/compressed/debug.S diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 5cad8a6..13bdd10 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -24,6 +24,11 @@ endif AFLAGS_head.o += -DTEXT_OFFSET=$(TEXT_OFFSET) HEAD = head.o OBJS += misc.o decompress.o +ifeq ($(CONFIG_ARCH_MULTIPLATFORM),y) +ifeq ($(CONFIG_DEBUG_LL),y) +OBJS += debug.o +endif +endif FONTC = $(srctree)/drivers/video/console/font_acorn_8x8.c # string library code (-Os is enforced to keep it much smaller) diff --git a/arch/arm/boot/compressed/debug.S b/arch/arm/boot/compressed/debug.S new file mode 100644 index 0000000..6e8382d --- /dev/null +++ b/arch/arm/boot/compressed/debug.S @@ -0,0 +1,12 @@ +#include +#include + +#include CONFIG_DEBUG_LL_INCLUDE + +ENTRY(putc) + addruart r1, r2, r3 + waituart r3, r1 + senduart r0, r1 + busyuart r3, r1 + mov pc, lr +ENDPROC(putc) diff --git a/arch/arm/include/debug/uncompress.h b/arch/arm/include/debug/uncompress.h index e19955d..9aa5314 100644 --- a/arch/arm/include/debug/uncompress.h +++ b/arch/arm/include/debug/uncompress.h @@ -1,3 +1,7 @@ +#ifdef CONFIG_DEBUG_LL +extern void putc(int c); +#else static inline void putc(int c) {} +#endif static inline void flush(void) {} static inline void arch_decomp_setup(void) {}