diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/asm-arm/arch-ebsa110/debug-macro.S | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/asm-arm/arch-ebsa110/debug-macro.S')
| -rw-r--r-- | include/asm-arm/arch-ebsa110/debug-macro.S | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/include/asm-arm/arch-ebsa110/debug-macro.S b/include/asm-arm/arch-ebsa110/debug-macro.S index dcd03a40c502..f61cadabe0ec 100644 --- a/include/asm-arm/arch-ebsa110/debug-macro.S +++ b/include/asm-arm/arch-ebsa110/debug-macro.S | |||
| @@ -16,19 +16,6 @@ | |||
| 16 | orr \rx, \rx, #0x00000be0 | 16 | orr \rx, \rx, #0x00000be0 |
| 17 | .endm | 17 | .endm |
| 18 | 18 | ||
| 19 | .macro senduart,rd,rx | 19 | #define UART_SHIFT 2 |
| 20 | strb \rd, [\rx] | 20 | #define FLOW_CONTROL |
| 21 | .endm | 21 | #include <asm/hardware/debug-8250.h> |
| 22 | |||
| 23 | .macro busyuart,rd,rx | ||
| 24 | 1002: ldrb \rd, [\rx, #0x14] | ||
| 25 | and \rd, \rd, #0x60 | ||
| 26 | teq \rd, #0x60 | ||
| 27 | bne 1002b | ||
| 28 | .endm | ||
| 29 | |||
| 30 | .macro waituart,rd,rx | ||
| 31 | 1001: ldrb \rd, [\rx, #0x18] | ||
| 32 | tst \rd, #0x10 | ||
| 33 | beq 1001b | ||
| 34 | .endm | ||