From: Arnaud Patard (Rtp) Date: Fri, 5 Aug 2011 07:32:41 +0000 (+0200) Subject: iMX: Fix build for iMX53 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d9c927833a42b4eaae4addd031f780f4530f7a2d;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git iMX: Fix build for iMX53 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 Signed-off-by: Sascha Hauer --- diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S index 91fc7cdb5dc9..e4dde91f0231 100644 --- a/arch/arm/plat-mxc/include/mach/debug-macro.S +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S @@ -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