diff options
| author | Eric Miao <eric.miao@marvell.com> | 2008-06-02 15:58:03 +0800 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 21:38:31 +0100 |
| commit | 6d3dfe4a3141476a3cf59ce6d2d1c25f9b5cfae8 (patch) | |
| tree | 19d67b4415d3e4da6cd68311a97ada165bc5bea8 /include | |
| parent | b18773d545e65fe442479e3f9853c8ebb8ec45d6 (diff) | |
| download | kernel-crypto-6d3dfe4a3141476a3cf59ce6d2d1c25f9b5cfae8.tar.gz kernel-crypto-6d3dfe4a3141476a3cf59ce6d2d1c25f9b5cfae8.tar.xz kernel-crypto-6d3dfe4a3141476a3cf59ce6d2d1c25f9b5cfae8.zip | |
[ARM] pxa: allow display of uncompress message through STUART
Some boards use UART other than FFUART for the console, E.g. Marvell
PXA3xx Form Factor Platform (aka Littleton) uses STUART. This patch
modifies the uncompress.h so that display of the uncompress message
is routed to the STUART.
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-pxa/uncompress.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/asm-arm/arch-pxa/uncompress.h b/include/asm-arm/arch-pxa/uncompress.h index dadf4c20b62..f4551269aaf 100644 --- a/include/asm-arm/arch-pxa/uncompress.h +++ b/include/asm-arm/arch-pxa/uncompress.h @@ -11,11 +11,11 @@ #include <linux/serial_reg.h> #include <asm/arch/pxa-regs.h> +#include <asm/mach-types.h> -#define __REG(x) ((volatile unsigned long *)x) - -#define UART FFUART +#define __REG(x) ((volatile unsigned long *)x) +static volatile unsigned long *UART = FFUART; static inline void putc(char c) { @@ -33,8 +33,13 @@ static inline void flush(void) { } +static inline void arch_decomp_setup(void) +{ + if (machine_is_littleton()) + UART = STUART; +} + /* * nothing to do */ -#define arch_decomp_setup() #define arch_decomp_wdog() |