diff options
| author | Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> | 2011-08-05 03:32:41 -0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-08 02:38:45 -0400 |
| commit | d9c927833a42b4eaae4addd031f780f4530f7a2d (patch) | |
| tree | 21cdbfc0cd7d648e1c579e5abaa11581849bcaa7 /arch | |
| parent | 546fb6cbde1d990af3e28e2f6d7061ef4eef25bf (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/debug-macro.S | 8 |
1 files changed, 8 insertions, 0 deletions
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 @@ | |||
| 44 | #define UART_PADDR MX51_UART1_BASE_ADDR | 44 | #define UART_PADDR MX51_UART1_BASE_ADDR |
| 45 | #endif | 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 | #define UART_VADDR IMX_IO_ADDRESS(UART_PADDR) | 55 | #define UART_VADDR IMX_IO_ADDRESS(UART_PADDR) |
| 48 | 56 | ||
| 49 | .macro addruart, rp, rv | 57 | .macro addruart, rp, rv |