Commit 59bba2a9 authored by Rob Herring's avatar Rob Herring
Browse files

ARM: picoxcell: move debug macros to include/debug 



Move picoxcell debug-macro.S over to common debug macro directory.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Jamie Iles <jamie@jamieiles.com>
parent 6111bf7c

arch/arm/Kconfig.debug

+8 −0
Original line number Diff line number Diff line
@@ -268,6 +268,13 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on MVEBU based platforms.



	config DEBUG_PICOXCELL_UART

		depends on ARCH_PICOXCELL

		bool "Use PicoXcell UART for low-level debug"

		help

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

		  on PicoXcell based platforms.



	config DEBUG_REALVIEW_STD_PORT

		bool "RealView Default UART"

		depends on ARCH_REALVIEW
@@ -392,6 +399,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/icedcc.S" if DEBUG_ICEDCC

	default "debug/highbank.S" if DEBUG_HIGHBANK_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART

	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \

		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1

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

+2 −2
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ 
 * accesses to the 8250.

 */

#include <linux/serial_reg.h>

#include <mach/hardware.h>

#include <mach/map.h>



#define UART_SHIFT 2

#define PICOXCELL_UART1_BASE		0x80230000

#define PHYS_TO_IO(x)			(((x) & 0x00ffffff) | 0xfe000000)



		.macro	addruart, rp, rv, tmp

		ldr	\rv, =PHYS_TO_IO(PICOXCELL_UART1_BASE)