Commit 7610b607 authored by Russell King's avatar Russell King

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cce278d2
...@@ -856,6 +856,15 @@ config DEBUG_LL_INCLUDE ...@@ -856,6 +856,15 @@ config DEBUG_LL_INCLUDE
default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1 default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
default "mach/debug-macro.S" 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 config DEBUG_UNCOMPRESS
bool bool
depends on ARCH_MULTIPLATFORM depends on ARCH_MULTIPLATFORM
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
.endm .endm
.macro waituart,rd,rx .macro waituart,rd,rx
#ifdef FLOW_CONTROL #ifdef CONFIG_DEBUG_UART_8250_FLOW_CONTROL
1001: ldrb \rd, [\rx, #UART_MSR << UART_SHIFT] 1001: ldrb \rd, [\rx, #UART_MSR << UART_SHIFT]
tst \rd, #UART_MSR_CTS tst \rd, #UART_MSR_CTS
beq 1001b beq 1001b
......
...@@ -18,5 +18,4 @@ ...@@ -18,5 +18,4 @@
.endm .endm
#define UART_SHIFT 2 #define UART_SHIFT 2
#define FLOW_CONTROL
#include <asm/hardware/debug-8250.S> #include <asm/hardware/debug-8250.S>
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
.endm .endm
#define UART_SHIFT 0 #define UART_SHIFT 0
#define FLOW_CONTROL
#include <asm/hardware/debug-8250.S> #include <asm/hardware/debug-8250.S>
#else #else
......
...@@ -17,5 +17,4 @@ ...@@ -17,5 +17,4 @@
.endm .endm
#define UART_SHIFT 2 #define UART_SHIFT 2
#define FLOW_CONTROL
#include <asm/hardware/debug-8250.S> #include <asm/hardware/debug-8250.S>
...@@ -19,5 +19,4 @@ ...@@ -19,5 +19,4 @@
.endm .endm
#define UART_SHIFT 2 #define UART_SHIFT 2
#define FLOW_CONTROL
#include <asm/hardware/debug-8250.S> #include <asm/hardware/debug-8250.S>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment