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>

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 9064ed492fb5ff7848e387feafbfa6d9d3e7b10f..8d3bc84fb612d4e70d3ede7774fd60435935eadf 100644 (file)
--- 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 22c689255e6e8767499c90b03732ce94d16efcbc..bca304576be0b86352a759fc1a1a0aa032007cf8 100644 (file)
--- 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 bb02c05e68128d58c5099f937734e097dfc20174..9b66e79632a935cc1501edc9e8b9d291f53de303 100644 (file)
--- 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 c169f0c99b2a323ad2f88ff0f9d20fac4579a064..18130fe99f28a839840708f66c9a511b2c267b48 100644 (file)
--- 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 837670763b85347b2b37d6050fa6206ba9c7cd69..cdee448dd34e055093a6505cc511539fc2be127f 100644 (file)
--- 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 6d28cc99b1243e4b016fc15208842c1f5c0940a4..a92753d0daeb32a6f2c6394b77bdb96bc315e60a 100644 (file)
--- 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>