aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-07-06 22:59:10 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-08-25 17:10:59 +0100
commit7610b607b03ada21e89d964ec27d87a5b93c3d7f (patch)
tree191fc53ebf3f493df9e2032e6913596404781d8e
parentcce278d20340e292dbcbf25db8042baf9e2d88dd (diff)
downloadlinux-linaro-stable-7610b607b03ada21e89d964ec27d87a5b93c3d7f.tar.gz
ARM: debug: provide 8250 debug uart flow control configuration option
Move the definition out of the machine class debug-macro.S header into the Kconfig files. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/Kconfig.debug9
-rw-r--r--arch/arm/include/asm/hardware/debug-8250.S2
-rw-r--r--arch/arm/mach-ebsa110/include/mach/debug-macro.S1
-rw-r--r--arch/arm/mach-footbridge/include/mach/debug-macro.S1
-rw-r--r--arch/arm/mach-gemini/include/mach/debug-macro.S1
-rw-r--r--arch/arm/mach-rpc/include/mach/debug-macro.S1
6 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 9064ed492fb5..8d3bc84fb612 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -856,6 +856,15 @@ config DEBUG_LL_INCLUDE
default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
default "mach/debug-macro.S"
+config DEBUG_UART_8250
+ def_bool ARCH_EBSA110 || (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \
+ ARCH_GEMINI || ARCH_RPC
+
+config DEBUG_UART_8250_FLOW_CONTROL
+ bool "Enable flow control for 8250 UART"
+ depends on DEBUG_UART_8250
+ default y if ARCH_EBSA110 || FOOTBRIDGE || ARCH_GEMINI || ARCH_RPC
+
config DEBUG_UNCOMPRESS
bool
depends on ARCH_MULTIPLATFORM
diff --git a/arch/arm/include/asm/hardware/debug-8250.S b/arch/arm/include/asm/hardware/debug-8250.S
index 22c689255e6e..bca304576be0 100644
--- a/arch/arm/include/asm/hardware/debug-8250.S
+++ b/arch/arm/include/asm/hardware/debug-8250.S
@@ -21,7 +21,7 @@
.endm
.macro waituart,rd,rx
-#ifdef FLOW_CONTROL
+#ifdef CONFIG_DEBUG_UART_8250_FLOW_CONTROL
1001: ldrb \rd, [\rx, #UART_MSR << UART_SHIFT]
tst \rd, #UART_MSR_CTS
beq 1001b
diff --git a/arch/arm/mach-ebsa110/include/mach/debug-macro.S b/arch/arm/mach-ebsa110/include/mach/debug-macro.S
index bb02c05e6812..9b66e79632a9 100644
--- a/arch/arm/mach-ebsa110/include/mach/debug-macro.S
+++ b/arch/arm/mach-ebsa110/include/mach/debug-macro.S
@@ -18,5 +18,4 @@
.endm
#define UART_SHIFT 2
-#define FLOW_CONTROL
#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-footbridge/include/mach/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S
index c169f0c99b2a..18130fe99f28 100644
--- a/arch/arm/mach-footbridge/include/mach/debug-macro.S
+++ b/arch/arm/mach-footbridge/include/mach/debug-macro.S
@@ -23,7 +23,6 @@
.endm
#define UART_SHIFT 0
-#define FLOW_CONTROL
#include <asm/hardware/debug-8250.S>
#else
diff --git a/arch/arm/mach-gemini/include/mach/debug-macro.S b/arch/arm/mach-gemini/include/mach/debug-macro.S
index 837670763b85..cdee448dd34e 100644
--- a/arch/arm/mach-gemini/include/mach/debug-macro.S
+++ b/arch/arm/mach-gemini/include/mach/debug-macro.S
@@ -17,5 +17,4 @@
.endm
#define UART_SHIFT 2
-#define FLOW_CONTROL
#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-rpc/include/mach/debug-macro.S b/arch/arm/mach-rpc/include/mach/debug-macro.S
index 6d28cc99b124..a92753d0daeb 100644
--- a/arch/arm/mach-rpc/include/mach/debug-macro.S
+++ b/arch/arm/mach-rpc/include/mach/debug-macro.S
@@ -19,5 +19,4 @@
.endm
#define UART_SHIFT 2
-#define FLOW_CONTROL
#include <asm/hardware/debug-8250.S>