From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Subject: Re: [PATCH 3/6] OMAP4: Re-arrange the low level debug code Date: Thu, 10 Dec 2009 13:35:48 +0300 Message-ID: <4B20CF04.8060208@ru.mvista.com> References: <1260383350-32681-1-git-send-email-santosh.shilimkar@ti.com> <1260383350-32681-2-git-send-email-santosh.shilimkar@ti.com> <1260383350-32681-3-git-send-email-santosh.shilimkar@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from gateway-1237.mvista.com ([206.112.117.35]:51391 "HELO imap.sh.mvista.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP id S933502AbZLJKf7 (ORCPT ); Thu, 10 Dec 2009 05:35:59 -0500 In-Reply-To: <1260383350-32681-3-git-send-email-santosh.shilimkar@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Santosh Shilimkar Cc: tony@atomide.com, linux-omap@vger.kernel.org, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org Hello. Santosh Shilimkar wrote: > On OMAP4430 the UART3 base address is different than that on OMAP3. > Because of this existing code needs additional #ifdef'ry to accommodate > that code. Hence this patch separates it. Also UART3 base address is > fixed for OMAP4430 in this patch. > > Signed-off-by: Santosh Shilimkar > [...] > diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-omap2/include/mach/debug-macro.S > index e9f255d..b2b4b29 100644 > --- a/arch/arm/mach-omap2/include/mach/debug-macro.S > +++ b/arch/arm/mach-omap2/include/mach/debug-macro.S > @@ -25,7 +25,7 @@ > add \rx, \rx, #0x00004000 @ UART 3 > #endif > > -#elif defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) > +#elif CONFIG_ARCH_OMAP3 > Why you've dropped defined()? This doesn't seem right as it should cause error when CONFIG_ARCH_OMAP3=n... > moveq \rx, #0x48000000 @ physical base address > movne \rx, #0xfa000000 @ virtual base > orr \rx, \rx, #0x0006a000 > @@ -36,6 +36,17 @@ > add \rx, \rx, #0x00fb0000 @ UART 3 > add \rx, \rx, #0x00006000 > #endif > +#elif CONFIG_ARCH_OMAP4 > Same comment here... WBR, Sergei