From patchwork Fri Aug 5 07:32:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Arnaud Patard (Rtp)" X-Patchwork-Id: 108617 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C7BC4B6EE8 for ; Fri, 5 Aug 2011 17:35:21 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QpEw6-0005TY-6k; Fri, 05 Aug 2011 07:35:14 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QpEw4-00017M-U2; Fri, 05 Aug 2011 07:35:12 +0000 Received: from lebrac.rtp-net.org ([88.191.135.105]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QpEvx-000174-EC for linux-arm-kernel@lists.infradead.org; Fri, 05 Aug 2011 07:35:10 +0000 Received: by lebrac.rtp-net.org (Postfix, from userid 1000) id 4D8F729264; Fri, 5 Aug 2011 09:34:28 +0200 (CEST) Message-Id: <20110805073253.599604130@rtp-net.org> User-Agent: quilt/0.48-1 Date: Fri, 05 Aug 2011 09:32:41 +0200 From: Arnaud Patard (Rtp) To: linux-arm-kernel@lists.infradead.org Subject: [patch 1/1] iMX: Fix build for iMX53 References: <20110805073240.162681115@rtp-net.org> Content-Disposition: inline; filename=test.patch X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110805_033505_612410_09771F42 X-CRM114-Status: GOOD ( 10.01 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.8 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list 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+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Commit fad107086d5a869c1c07e5bb35b7b57a10ecf578 fixed the wrong test for MX51 as the MX51 addresses are wrong for MX50 and MX53 but now it's MX51 only, UART_PADDR is not defined anymore when building for MX50/MX53. Signed-off-by: Arnaud Patard Tested-by: Steev Klimaszewski Acked-by: Uwe Kleine-König Index: linux-2.6/arch/arm/plat-mxc/include/mach/debug-macro.S =================================================================== --- linux-2.6.orig/arch/arm/plat-mxc/include/mach/debug-macro.S 2011-08-05 00:38:15.000000000 +0200 +++ linux-2.6/arch/arm/plat-mxc/include/mach/debug-macro.S 2011-08-05 09:32:32.000000000 +0200 @@ -44,6 +44,14 @@ #define UART_PADDR MX51_UART1_BASE_ADDR #endif +/* iMX50/53 have same addresses, but not iMX51 */ +#if defined(CONFIG_SOC_IMX50) || defined(CONFIG_SOC_IMX53) +#ifdef UART_PADDR +#error "CONFIG_DEBUG_LL is incompatible with multiple archs" +#endif +#define UART_PADDR MX53_UART1_BASE_ADDR +#endif + #define UART_VADDR IMX_IO_ADDRESS(UART_PADDR) .macro addruart, rp, rv