Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1285b8f8 authored by Will Deacon's avatar Will Deacon
Browse files

ARM: realview: use Kconfig choice for debug UART selection 



Now that the DEBUG_LL UART can be selected by a Kconfig choice, simplify
the #ifdefery in debug-macro.S and add entries to the top-level
Kconfig.debug instead.

Acked-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 952aeeb2

arch/arm/Kconfig.debug

+16 −0
Original line number Diff line number Diff line
@@ -161,6 +161,22 @@ choice 
		  The uncompressor code port configuration is now handled

		  by CONFIG_S3C_LOWLEVEL_UART_PORT.



	config DEBUG_REALVIEW_STD_PORT

		bool "RealView Default UART"

		depends on ARCH_REALVIEW

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the serial port on RealView EB, PB11MP, PBA8

		  and PBX platforms.



	config DEBUG_REALVIEW_PB1176_PORT

		bool "RealView PB1176 UART"

		depends on MACH_REALVIEW_PB1176

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the standard serial port on the RealView

		  PB1176 platform.



endchoice



config EARLY_PRINTK

arch/arm/mach-realview/include/mach/debug-macro.S

+2 −15
Original line number Diff line number Diff line
@@ -10,23 +10,10 @@ 
 * published by the Free Software Foundation.

 */



#if defined(CONFIG_MACH_REALVIEW_EB) || \

    defined(CONFIG_MACH_REALVIEW_PB11MP) || \

    defined(CONFIG_MACH_REALVIEW_PBA8) || \

    defined(CONFIG_MACH_REALVIEW_PBX)

#ifndef DEBUG_LL_UART_OFFSET

#ifdef CONFIG_DEBUG_REALVIEW_STD_PORT

#define DEBUG_LL_UART_OFFSET	0x00009000

#elif DEBUG_LL_UART_OFFSET != 0x00009000

#warning "DEBUG_LL_UART_OFFSET already defined to a different value"

#endif

#endif



#ifdef CONFIG_MACH_REALVIEW_PB1176

#ifndef DEBUG_LL_UART_OFFSET

#elif defined(CONFIG_DEBUG_REALVIEW_PB1176_PORT)

#define DEBUG_LL_UART_OFFSET	0x0010c000

#elif DEBUG_LL_UART_OFFSET != 0x0010c000

#warning "DEBUG_LL_UART_OFFSET already defined to a different value"

#endif

#endif



#ifndef DEBUG_LL_UART_OFFSET