diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2011-11-08 10:33:03 -0800 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-11-10 10:17:06 -0800 |
| commit | 650e3f0d66ade2a614d854765dae3bbc9a87f58d (patch) | |
| tree | d849c9687ae7c9a3afcc9e49444eba167ec16394 /arch/arm/mach-msm/include/mach/debug-macro.S | |
| parent | 1ea6b8f48918282bdca0b32a34095504ee65bab5 (diff) | |
ARM: msm: Consolidate and move DEBUG_LL to DEBUG_LL choice
Now that DEBUG_LL is a choice we can move MSM's homegrown choice
menu to DEBUG_LL.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-msm/include/mach/debug-macro.S | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S index 2dc73ccddb11..db1f22830d64 100644 --- a/arch/arm/mach-msm/include/mach/debug-macro.S +++ b/arch/arm/mach-msm/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* arch/arm/mach-msm7200/include/mach/debug-macro.S +/* * * Copyright (C) 2007 Google, Inc. * Author: Brian Swetland <swetland@google.com> @@ -14,15 +14,14 @@ * */ - - #include <mach/hardware.h> #include <mach/msm_iomap.h> -#if defined(CONFIG_HAS_MSM_DEBUG_UART_PHYS) && !defined(CONFIG_MSM_DEBUG_UART_NONE) .macro addruart, rp, rv, tmp +#ifdef MSM_DEBUG_UART_PHYS ldr \rp, =MSM_DEBUG_UART_PHYS ldr \rv, =MSM_DEBUG_UART_BASE +#endif .endm .macro senduart,rd,rx @@ -36,18 +35,6 @@ tst \rd, #0x04 beq 1001b .endm -#else - .macro addruart, rp, rv, tmp - mov \rv, #0xff000000 - orr \rv, \rv, #0x00f00000 - .endm - - .macro senduart,rd,rx - .endm - - .macro waituart,rd,rx - .endm -#endif .macro busyuart,rd,rx .endm |