Skip to content

Commit

Permalink
iMX: Fix build for iMX53
Browse files Browse the repository at this point in the history
Commit fad1070 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>
  • Loading branch information
Arnaud Patard (Rtp) authored and Sascha Hauer committed Aug 8, 2011
1 parent 546fb6c commit d9c9278
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions arch/arm/plat-mxc/include/mach/debug-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d9c9278

Please sign in to comment.