Commit e6131fa3 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Arnd Bergmann
Browse files

ARM: debug: move StrongARM debug include to arch/arm/include/debug 



StrongARM debug-macro.S is quite standalone thing, depending only on
register mappings. Move it to proper place and add Kconfig entry.

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 37f286e9

arch/arm/Kconfig.debug

+9 −0
Original line number Diff line number Diff line
@@ -734,6 +734,14 @@ choice 
		  their output to UART 2. The port must have been initialised

		  by the boot-loader before use.



	config DEBUG_SA1100

		depends on ARCH_SA1100

		bool "Use SA1100 UARTs for low-level debug"

		help

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

		  on SA-11x0 UART ports. The kernel will check for the first

		  enabled UART in a sequence 3-1-2.



	config DEBUG_SOCFPGA_UART

		depends on ARCH_SOCFPGA

		bool "Use SOCFPGA UART for low-level debug"
@@ -1052,6 +1060,7 @@ config DEBUG_STI_UART 


config DEBUG_LL_INCLUDE

	string

	default "debug/sa1100.S" if DEBUG_SA1100

	default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250

	default "debug/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2

	default "debug/meson.S" if DEBUG_MESON_UARTAO

arch/arm/mach-sa1100/include/mach/debug-macro.S→arch/arm/include/debug/sa1100.S

+8 −2
Original line number Diff line number Diff line 
/* arch/arm/mach-sa1100/include/mach/debug-macro.S

/* arch/arm/include/debug/sa1100.S

 *

 * Debugging macro include header

 *
@@ -10,7 +10,13 @@ 
 * published by the Free Software Foundation.

 *

*/

#include <mach/hardware.h>



#define UTCR3		0x0c

#define UTDR		0x14

#define UTSR1		0x20

#define UTCR3_TXE	0x00000002	/* Transmit Enable                 */

#define UTSR1_TBY	0x00000001	/* Transmitter BusY (read)         */

#define UTSR1_TNF	0x00000004	/* Transmit FIFO Not Full (read)   */



		.macro	addruart, rp, rv, tmp

		mrc	p15, 0, \rp, c1, c0