diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2004-05-13 16:05:27 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2004-05-13 16:05:27 +0100 |
| commit | bab1bc0fa425c364dff2ab25db34b09886801d6a (patch) | |
| tree | f950ccb41562b22d8d3ba10f1e5cf6c5eaa6e224 /arch/arm/kernel/debug.S | |
| parent | fc9754dc3a2cd08b65cc75ce9d22db9512e0bf77 (diff) | |
| parent | b57845a4bad6598e601003d3c9cbff16d5667178 (diff) | |
Merge bk://dsaxena.bkbits.net/linux-2.6-for-rmk
into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-ds
Diffstat (limited to 'arch/arm/kernel/debug.S')
| -rw-r--r-- | arch/arm/kernel/debug.S | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index 9957229de330..f94e567bf5e3 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S @@ -494,9 +494,24 @@ #include <asm/arch/serial.h> +#ifdef CONFIG_ARCH_OMAP730 +#define OMAP_SERIAL_REG_SHIFT 0 +#else +#define OMAP_SERIAL_REG_SHIFT 2 +#endif + /* See also __create_page_tables in head.S */ .macro addruart,rx - mov \rx, #0xff000000 + mrc p15, 0, \rx, c1, c0 + tst \rx, #1 @ MMU enabled? + moveq \rx, #0xff000000 @ physical base address + movne \rx, #0xfe000000 @ virtual base orr \rx, \rx, #0x00fb0000 +#ifdef CONFIG_OMAP_LL_DEBUG_UART3 + orr \rx, \rx, #0x00009000 @ UART 3 +#endif +#if defined(CONFIG_OMAP_LL_DEBUG_UART2) || defined(CONFIG_OMAP_LL_DEBUG_UART3) + orr \rx, \rx, #0x00000800 @ UART 2 & 3 +#endif .endm .macro senduart,rd,rx @@ -511,9 +526,6 @@ .endm .macro waituart,rd,rx -1001: ldrb \rd, [\rx, #(0x6 << OMAP_SERIAL_REG_SHIFT)] - tst \rd, #0x10 - beq 1001b .endm #elif defined(CONFIG_ARCH_S3C2410) |