Patchwork [1/1] iMX: Fix build for iMX53

login
register
mail settings
Submitter Arnaud Patard (Rtp)
Date Aug. 5, 2011, 7:32 a.m.
Message ID <20110805073253.599604130@rtp-net.org>
Download mbox | patch
Permalink /patch/108617/
State New
Headers show

Comments

Arnaud Patard (Rtp) - Aug. 5, 2011, 7:32 a.m.
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 <arnaud.patard@rtp-net.org>
Tested-by: Steev Klimaszewski <steev@genesi-usa.com>
Uwe Kleine-König - Aug. 5, 2011, 7:54 a.m.
On Fri, Aug 05, 2011 at 09:32:41AM +0200, Arnaud Patard wrote:
> 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 <arnaud.patard@rtp-net.org>
> Tested-by: Steev Klimaszewski <steev@genesi-usa.com>
> 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
Looks good

Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Best regards
Uwe
Sergei Shtylyov - Aug. 5, 2011, 11:04 a.m.
Hello.

On 05-08-2011 11:32, Arnaud Patard (Rtp) wrote:

> Commit fad107086d5a869c1c07e5bb35b7b57a10ecf578 fixed the wrong test for MX51

    Please specify that commit's summary in parens.

> 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 <arnaud.patard@rtp-net.org>
> Tested-by: Steev Klimaszewski <steev@genesi-usa.com>

WBR, Sergei

Patch

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