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

Commit 6dde5ac5 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx: move debug macros to include/debug 



Move imx debug-macro.S over to common debug macro directory.  It
removes the inclusion to hardware.h by hard-coding the physical
address of uart port and copying IMX_IO_P2V from hardware.h.

Since we will need a common solution, which might use a fixed virtual
address for uart port across platforms, we make a copy of IMX_IO_P2V
here as a temporary solution to enable low-level debug for imx
multi-platform build.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent e69dc9a9

arch/arm/Kconfig.debug

+8 −0
Original line number Original line Diff line number Diff line
@@ -412,6 +412,14 @@ endchoice 
config DEBUG_LL_INCLUDE

config DEBUG_LL_INCLUDE

	string

	string

	default "debug/icedcc.S" if DEBUG_ICEDCC

	default "debug/icedcc.S" if DEBUG_ICEDCC

	default "debug/imx.S" if DEBUG_IMX1_UART || \

				 DEBUG_IMX25_UART || \

				 DEBUG_IMX21_IMX27_UART || \

				 DEBUG_IMX31_IMX35_UART || \

				 DEBUG_IMX51_UART || \

				 DEBUG_IMX50_IMX53_UART ||\

				 DEBUG_IMX6Q_UART2 || \

				 DEBUG_IMX6Q_UART4

	default "debug/highbank.S" if DEBUG_HIGHBANK_UART

	default "debug/highbank.S" if DEBUG_HIGHBANK_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

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

+22 −11
Original line number Original line Diff line number Diff line
@@ -10,27 +10,38 @@ 
 * published by the Free Software Foundation.

 * published by the Free Software Foundation.

 *

 *

 */

 */

#include <mach/hardware.h>



#ifdef CONFIG_DEBUG_IMX1_UART

#ifdef CONFIG_DEBUG_IMX1_UART

#define UART_PADDR	MX1_UART1_BASE_ADDR

#define UART_PADDR	0x00206000

#elif defined (CONFIG_DEBUG_IMX25_UART)

#elif defined (CONFIG_DEBUG_IMX25_UART)

#define UART_PADDR	MX25_UART1_BASE_ADDR

#define UART_PADDR	0x43f90000

#elif defined (CONFIG_DEBUG_IMX21_IMX27_UART)

#elif defined (CONFIG_DEBUG_IMX21_IMX27_UART)

#define UART_PADDR	MX2x_UART1_BASE_ADDR

#define UART_PADDR	0x1000a000

#elif defined (CONFIG_DEBUG_IMX31_IMX35_UART)

#elif defined (CONFIG_DEBUG_IMX31_IMX35_UART)

#define UART_PADDR	MX3x_UART1_BASE_ADDR

#define UART_PADDR	0x43f90000

#elif defined (CONFIG_DEBUG_IMX51_UART)

#elif defined (CONFIG_DEBUG_IMX51_UART)

#define UART_PADDR	MX51_UART1_BASE_ADDR

#define UART_PADDR	0x73fbc000

#elif defined (CONFIG_DEBUG_IMX50_IMX53_UART)

#elif defined (CONFIG_DEBUG_IMX50_IMX53_UART)

#define UART_PADDR	MX53_UART1_BASE_ADDR

#define UART_PADDR	0x53fbc000

#elif defined (CONFIG_DEBUG_IMX6Q_UART2)

#elif defined (CONFIG_DEBUG_IMX6Q_UART2)

#define UART_PADDR	MX6Q_UART2_BASE_ADDR

#define UART_PADDR	0x021e8000

#elif defined (CONFIG_DEBUG_IMX6Q_UART4)

#elif defined (CONFIG_DEBUG_IMX6Q_UART4)

#define UART_PADDR	MX6Q_UART4_BASE_ADDR

#define UART_PADDR	0x021f0000

#endif

#endif





#define UART_VADDR	IMX_IO_ADDRESS(UART_PADDR)

/*

 * FIXME: This is a copy of IMX_IO_P2V in hardware.h, and needs to

 * stay sync with that.  It's hard to maintain, and should be fixed

 * globally for multi-platform build to use a fixed virtual address

 * for low-level debug uart port across platforms.

 */

#define IMX_IO_P2V(x)	(						\

			(((x) & 0x80000000) >> 7) |			\

			(0xf4000000 +					\

			(((x) & 0x50000000) >> 6) +			\

			(((x) & 0x0b000000) >> 4) +			\

			(((x) & 0x000fffff))))



#define UART_VADDR	IMX_IO_P2V(UART_PADDR)





		.macro	addruart, rp, rv, tmp

		.macro	addruart, rp, rv, tmp

		ldr	\rp, =UART_PADDR	@ physical

		ldr	\rp, =UART_PADDR	@ physical