diff options
Diffstat (limited to 'arch/arm/mach-mmp/include/mach/uncompress.h')
-rw-r--r-- | arch/arm/mach-mmp/include/mach/uncompress.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-mmp/include/mach/uncompress.h b/arch/arm/mach-mmp/include/mach/uncompress.h index c93d5fa5865c..a7dcc5307216 100644 --- a/arch/arm/mach-mmp/include/mach/uncompress.h +++ b/arch/arm/mach-mmp/include/mach/uncompress.h | |||
@@ -8,15 +8,16 @@ | |||
8 | 8 | ||
9 | #include <linux/serial_reg.h> | 9 | #include <linux/serial_reg.h> |
10 | #include <mach/addr-map.h> | 10 | #include <mach/addr-map.h> |
11 | #include <asm/mach-types.h> | ||
11 | 12 | ||
12 | #define UART1_BASE (APB_PHYS_BASE + 0x36000) | 13 | #define UART1_BASE (APB_PHYS_BASE + 0x36000) |
13 | #define UART2_BASE (APB_PHYS_BASE + 0x17000) | 14 | #define UART2_BASE (APB_PHYS_BASE + 0x17000) |
14 | #define UART3_BASE (APB_PHYS_BASE + 0x18000) | 15 | #define UART3_BASE (APB_PHYS_BASE + 0x18000) |
15 | 16 | ||
17 | static volatile unsigned long *UART = (unsigned long *)UART2_BASE; | ||
18 | |||
16 | static inline void putc(char c) | 19 | static inline void putc(char c) |
17 | { | 20 | { |
18 | volatile unsigned long *UART = (unsigned long *)UART2_BASE; | ||
19 | |||
20 | /* UART enabled? */ | 21 | /* UART enabled? */ |
21 | if (!(UART[UART_IER] & UART_IER_UUE)) | 22 | if (!(UART[UART_IER] & UART_IER_UUE)) |
22 | return; | 23 | return; |
@@ -34,8 +35,14 @@ static inline void flush(void) | |||
34 | { | 35 | { |
35 | } | 36 | } |
36 | 37 | ||
38 | static inline void arch_decomp_setup(void) | ||
39 | { | ||
40 | if (machine_is_avengers_lite()) | ||
41 | UART = (unsigned long *)UART3_BASE; | ||
42 | } | ||
43 | |||
37 | /* | 44 | /* |
38 | * nothing to do | 45 | * nothing to do |
39 | */ | 46 | */ |
40 | #define arch_decomp_setup() | 47 | |
41 | #define arch_decomp_wdog() | 48 | #define arch_decomp_wdog() |