Commit 4a003647 authored by Russell King's avatar Russell King
Browse files

ARM: debug: provide 8250 debug uart register shift configuration option 



Move the definition of the UART register shift out of the platform
specific header file into the Kconfig files.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7610b607

arch/arm/Kconfig.debug

+26 −2
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ choice 
	config DEBUG_MMP_UART2

		bool "Kernel low-level debugging message via MMP UART2"

		depends on ARCH_MMP

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on MMP UART2.
@@ -282,6 +283,7 @@ choice 
	config DEBUG_MMP_UART3

		bool "Kernel low-level debugging message via MMP UART3"

		depends on ARCH_MMP

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on MMP UART3.
@@ -326,6 +328,7 @@ choice 
	config DEBUG_MVEBU_UART

		bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)"

		depends on ARCH_MVEBU

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on MVEBU based platforms.
@@ -344,6 +347,7 @@ choice 
	config DEBUG_MVEBU_UART_ALTERNATE

		bool "Kernel low-level debugging messages via MVEBU UART (new bootloaders)"

		depends on ARCH_MVEBU

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on MVEBU based platforms.
@@ -365,6 +369,7 @@ choice 
	config DEBUG_NSPIRE_CLASSIC_UART

		bool "Kernel low-level debugging via TI-NSPIRE 8250 UART"

		depends on ARCH_NSPIRE

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on TI-NSPIRE classic models.
@@ -453,6 +458,7 @@ choice 
	config DEBUG_PXA_UART1

		depends on ARCH_PXA

		bool "Use PXA UART1 for low-level debug"

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on PXA UART1.
@@ -477,6 +483,7 @@ choice 
		bool "Kernel low-level debugging messages via Rockchip RK29 UART0"

		depends on ARCH_ROCKCHIP

		select DEBUG_ROCKCHIP_UART

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on Rockchip based platforms.
@@ -485,6 +492,7 @@ choice 
		bool "Kernel low-level debugging messages via Rockchip RK29 UART1"

		depends on ARCH_ROCKCHIP

		select DEBUG_ROCKCHIP_UART

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on Rockchip based platforms.
@@ -493,6 +501,7 @@ choice 
		bool "Kernel low-level debugging messages via Rockchip RK29 UART2"

		depends on ARCH_ROCKCHIP

		select DEBUG_ROCKCHIP_UART

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on Rockchip based platforms.
@@ -501,6 +510,7 @@ choice 
		bool "Kernel low-level debugging messages via Rockchip RK3X UART0"

		depends on ARCH_ROCKCHIP

		select DEBUG_ROCKCHIP_UART

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on Rockchip based platforms.
@@ -509,6 +519,7 @@ choice 
		bool "Kernel low-level debugging messages via Rockchip RK3X UART1"

		depends on ARCH_ROCKCHIP

		select DEBUG_ROCKCHIP_UART

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on Rockchip based platforms.
@@ -517,6 +528,7 @@ choice 
		bool "Kernel low-level debugging messages via Rockchip RK3X UART2"

		depends on ARCH_ROCKCHIP

		select DEBUG_ROCKCHIP_UART

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on Rockchip based platforms.
@@ -525,6 +537,7 @@ choice 
		bool "Kernel low-level debugging messages via Rockchip RK3X UART3"

		depends on ARCH_ROCKCHIP

		select DEBUG_ROCKCHIP_UART

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on Rockchip based platforms.
@@ -587,6 +600,7 @@ choice 
	config DEBUG_SUNXI_UART0

		bool "Kernel low-level debugging messages via sunXi UART0"

		depends on ARCH_SUNXI

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on Allwinner A1X based platforms on the UART0.
@@ -594,6 +608,7 @@ choice 
	config DEBUG_SUNXI_UART1

		bool "Kernel low-level debugging messages via sunXi UART1"

		depends on ARCH_SUNXI

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on Allwinner A1X based platforms on the UART1.
@@ -857,8 +872,17 @@ config DEBUG_LL_INCLUDE 
	default "mach/debug-macro.S"



config DEBUG_UART_8250

	def_bool ARCH_EBSA110 || (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \

		ARCH_GEMINI || ARCH_RPC

	def_bool ARCH_DOVE || ARCH_EBSA110 || \

		(FOOTBRIDGE && !DEBUG_DC21285_PORT) || \

		ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \

		ARCH_IOP33X || ARCH_IXP4XX || ARCH_KIRKWOOD || \

		ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC



config DEBUG_UART_8250_SHIFT

	int "Register offset shift for the 8250 debug UART"

	depends on DEBUG_UART_8250

	default 0 if FOOTBRIDGE || ARCH_IOP32X

	default 2



config DEBUG_UART_8250_FLOW_CONTROL

	bool "Enable flow control for 8250 UART"

arch/arm/include/asm/hardware/debug-8250.S

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 
 */

#include <linux/serial_reg.h>



#ifndef UART_SHIFT

#define UART_SHIFT CONFIG_DEBUG_UART_8250_SHIFT

#endif



		.macro	senduart,rd,rx

		strb	\rd, [\rx, #UART_TX << UART_SHIFT]

		.endm

arch/arm/include/debug/mvebu.S

+0 −1
Original line number Diff line number Diff line
@@ -26,5 +26,4 @@ 
	orr	\rv, \rv, #0x00012000

	.endm



#define UART_SHIFT	2

#include <asm/hardware/debug-8250.S>

arch/arm/include/debug/nspire.S

+0 −1
Original line number Diff line number Diff line
@@ -23,6 +23,5 @@ 
#endif



#ifdef CONFIG_DEBUG_NSPIRE_CLASSIC_UART

#define UART_SHIFT 2

#include <asm/hardware/debug-8250.S>

#endif

arch/arm/include/debug/pxa.S

+0 −1
Original line number Diff line number Diff line
@@ -29,5 +29,4 @@ 
	ldr	\rv, =PXA_UART_REG_VIRT_BASE

	.endm



#define UART_SHIFT	2

#include <asm/hardware/debug-8250.S>