diff options
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/debug-macro.S | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S index 5a6ae1b9e1e8..0b6e11eaeb8c 100644 --- a/arch/arm/plat-mxc/include/mach/debug-macro.S +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | #define IMX_NEEDS_DEPRECATED_SYMBOLS | ||
| 13 | 14 | ||
| 14 | #ifdef CONFIG_ARCH_MX1 | 15 | #ifdef CONFIG_ARCH_MX1 |
| 15 | #include <mach/mx1.h> | 16 | #include <mach/mx1.h> |
| @@ -44,13 +45,22 @@ | |||
| 44 | #define UART_VADDR AIPS1_IO_ADDRESS(UART1_BASE_ADDR) | 45 | #define UART_VADDR AIPS1_IO_ADDRESS(UART1_BASE_ADDR) |
| 45 | #endif | 46 | #endif |
| 46 | 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 | |||
| 47 | #ifdef CONFIG_ARCH_MXC91231 | 57 | #ifdef CONFIG_ARCH_MXC91231 |
| 48 | #ifdef UART_PADDR | 58 | #ifdef UART_PADDR |
| 49 | #error "CONFIG_DEBUG_LL is incompatible with multiple archs" | 59 | #error "CONFIG_DEBUG_LL is incompatible with multiple archs" |
| 50 | #endif | 60 | #endif |
| 51 | #include <mach/mxc91231.h> | 61 | #include <mach/mxc91231.h> |
| 52 | #define UART_PADDR MXC91231_UART2_BASE_ADDR | 62 | #define UART_PADDR MXC91231_UART2_BASE_ADDR |
| 53 | #define UART_VADDR MXC91231_AIPS1_IO_ADDRESS(MXC91231_UART2_BASE_ADDR) | 63 | #define UART_VADDR MXC91231_IO_ADDRESS(MXC91231_UART2_BASE_ADDR) |
| 54 | #endif | 64 | #endif |
| 55 | .macro addruart, rx, tmp | 65 | .macro addruart, rx, tmp |
| 56 | mrc p15, 0, \rx, c1, c0 | 66 | mrc p15, 0, \rx, c1, c0 |
