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-imx/uncompress.h | |
| parent | 3747b36eeab93d8969e86987bbc1d44971229b26 (diff) | |
| download | linux-a081568d7016061ed848696984e3acf1ba0b3054.tar.gz linux-a081568d7016061ed848696984e3acf1ba0b3054.tar.bz2 linux-a081568d7016061ed848696984e3acf1ba0b3054.zip | |
[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-imx/uncompress.h')
| -rw-r--r-- | include/asm-arm/arch-imx/uncompress.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/include/asm-arm/arch-imx/uncompress.h b/include/asm-arm/arch-imx/uncompress.h index 096077f2750b..da333f69136f 100644 --- a/include/asm-arm/arch-imx/uncompress.h +++ b/include/asm-arm/arch-imx/uncompress.h @@ -39,8 +39,7 @@ * * This does not append a newline */ -static void -putstr(const char *s) +static void putc(int c) { unsigned long serial_port; @@ -54,20 +53,14 @@ putstr(const char *s) return; } while(0); - while (*s) { - while ( !(UART(USR2) & USR2_TXFE) ) - barrier(); + while (!(UART(USR2) & USR2_TXFE)) + barrier(); - UART(TXR) = *s; - - if (*s == '\n') { - while ( !(UART(USR2) & USR2_TXFE) ) - barrier(); + UART(TXR) = c; +} - UART(TXR) = '\r'; - } - s++; - } +static inline void flush(void) +{ } /* |