diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /include/asm-arm/arch-imx | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-arm/arch-imx')
| -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 @@ | |||
| 39 | * | 39 | * |
| 40 | * This does not append a newline | 40 | * This does not append a newline |
| 41 | */ | 41 | */ |
| 42 | static void | 42 | static void putc(int c) |
| 43 | putstr(const char *s) | ||
| 44 | { | 43 | { |
| 45 | unsigned long serial_port; | 44 | unsigned long serial_port; |
| 46 | 45 | ||
| @@ -54,20 +53,14 @@ putstr(const char *s) | |||
| 54 | return; | 53 | return; |
| 55 | } while(0); | 54 | } while(0); |
| 56 | 55 | ||
| 57 | while (*s) { | 56 | while (!(UART(USR2) & USR2_TXFE)) |
| 58 | while ( !(UART(USR2) & USR2_TXFE) ) | 57 | barrier(); |
| 59 | barrier(); | ||
| 60 | 58 | ||
| 61 | UART(TXR) = *s; | 59 | UART(TXR) = c; |
| 62 | 60 | } | |
| 63 | if (*s == '\n') { | ||
| 64 | while ( !(UART(USR2) & USR2_TXFE) ) | ||
| 65 | barrier(); | ||
| 66 | 61 | ||
| 67 | UART(TXR) = '\r'; | 62 | static inline void flush(void) |
| 68 | } | 63 | { |
| 69 | s++; | ||
| 70 | } | ||
| 71 | } | 64 | } |
| 72 | 65 | ||
| 73 | /* | 66 | /* |