diff options
| author | Amit Kucheria <amit.kucheria@canonical.com> | 2010-02-04 15:09:40 -0500 |
|---|---|---|
| committer | Amit Kucheria <amit.kucheria@canonical.com> | 2010-02-09 11:32:10 -0500 |
| commit | 438caa3f6c91ba21c539a8547c4075b619dc6500 (patch) | |
| tree | 6590ae5c3b5140babd9642572a042695a2c49c82 /arch/arm/plat-mxc/include/mach/debug-macro.S | |
| parent | 0f3332c4fabb2227b1bc15dc7542017d08f10a09 (diff) | |
mxc: changes to common plat-mxc code to add support for i.MX5
Prepare for i.MX5 SoC code by adding the relevant macros to common plat-mxc
code.
Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/debug-macro.S | 9 |
1 files changed, 9 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 916d4fcb2ef2..133d66bfb533 100644 --- a/arch/arm/plat-mxc/include/mach/debug-macro.S +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S | |||
| @@ -45,6 +45,15 @@ | |||
| 45 | #define UART_VADDR AIPS1_IO_ADDRESS(UART1_BASE_ADDR) | 45 | #define UART_VADDR AIPS1_IO_ADDRESS(UART1_BASE_ADDR) |
| 46 | #endif | 46 | #endif |
| 47 | 47 | ||
| 48 | #ifdef CONFIG_ARCH_MX5 | ||
| 49 | #ifdef UART_PADDR | ||
| 50 | #error "CONFIG_DEBUG_LL is incompatible with multiple archs" | ||
| 51 | #endif | ||
| 52 | #include <mach/mx51.h> | ||
| 53 | #define UART_PADDR MX51_UART1_BASE_ADDR | ||
| 54 | #define UART_VADDR MX51_AIPS1_IO_ADDRESS(MX51_UART1_BASE_ADDR) | ||
| 55 | #endif | ||
| 56 | |||
| 48 | #ifdef CONFIG_ARCH_MXC91231 | 57 | #ifdef CONFIG_ARCH_MXC91231 |
| 49 | #ifdef UART_PADDR | 58 | #ifdef UART_PADDR |
| 50 | #error "CONFIG_DEBUG_LL is incompatible with multiple archs" | 59 | #error "CONFIG_DEBUG_LL is incompatible with multiple archs" |