diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-28 10:24:33 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-28 10:24:33 +0100 |
| commit | a081568d7016061ed848696984e3acf1ba0b3054 (patch) | |
| tree | 5a6cd28d51e3c0b694499f4d0795b22a3d020eba /include/asm-arm/arch-iop3xx | |
| parent | 3747b36eeab93d8969e86987bbc1d44971229b26 (diff) | |
| download | kernel_samsung_smdk4412-a081568d7016061ed848696984e3acf1ba0b3054.zip kernel_samsung_smdk4412-a081568d7016061ed848696984e3acf1ba0b3054.tar.gz kernel_samsung_smdk4412-a081568d7016061ed848696984e3acf1ba0b3054.tar.bz2 | |
[ARM] Fix decompressor serial IO to give CRLF not LFCR
As per the corresponding change to the serial drivers, arrange
for ARM decompressors to give CRLF. Move the common putstr code
into misc.c such that machines only need to supply "putc" and
"flush" functions.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-iop3xx')
| -rw-r--r-- | include/asm-arm/arch-iop3xx/uncompress.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/asm-arm/arch-iop3xx/uncompress.h b/include/asm-arm/arch-iop3xx/uncompress.h index 82b8876..c98eb62 100644 --- a/include/asm-arm/arch-iop3xx/uncompress.h +++ b/include/asm-arm/arch-iop3xx/uncompress.h @@ -19,23 +19,15 @@ static volatile UTYPE uart_base; #define TX_DONE (UART_LSR_TEMT|UART_LSR_THRE) -static __inline__ void putc(char c) +static inline void putc(char c) { - while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE); + while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE) + barrier(); *uart_base = c; } -/* - * This does not append a newline - */ -static void putstr(const char *s) +static inline void flush(void) { - while (*s) { - putc(*s); - if (*s == '\n') - putc('\r'); - s++; - } } static __inline__ void __arch_decomp_setup(unsigned long arch_id) |