tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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 <arnaud.patard@rtp-net.org>
Tested-by: Steev Klimaszewski <steev@genesi-usa.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

authored by

Arnaud Patard (Rtp) and committed by
Sascha Hauer d9c92783 546fb6cb

+8
+8
arch/arm/plat-mxc/include/mach/debug-macro.S
··· 44 44 #define UART_PADDR MX51_UART1_BASE_ADDR 45 45 #endif 46 46 47 + /* iMX50/53 have same addresses, but not iMX51 */ 48 + #if defined(CONFIG_SOC_IMX50) || defined(CONFIG_SOC_IMX53) 49 + #ifdef UART_PADDR 50 + #error "CONFIG_DEBUG_LL is incompatible with multiple archs" 51 + #endif 52 + #define UART_PADDR MX53_UART1_BASE_ADDR 53 + #endif 54 + 47 55 #define UART_VADDR IMX_IO_ADDRESS(UART_PADDR) 48 56 49 57 .macro addruart, rp, rv