aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-05-02 23:21:03 -0400
committerShawn Guo <shawn.guo@linaro.org>2013-06-17 03:45:11 -0400
commit34e8a16b944e63e0032e9b1ca699593aad20a7ba (patch)
tree4838901cceb8f44d560cff9161f1495d0ff1cb78 /arch
parent45fe6810347b0a83561a13d9ee656c899a309fc0 (diff)
ARM: imx: enable low-level debug support for imx6sl
Enable low-level debug support for i.MX6 SoloLite by adding the debug port definitions for the SoC. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig.debug13
-rw-r--r--arch/arm/include/debug/imx-uart.h10
2 files changed, 21 insertions, 2 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 1d41908d5cda..29f7623553c1 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -251,6 +251,13 @@ choice
251 Say Y here if you want kernel low-level debugging support 251 Say Y here if you want kernel low-level debugging support
252 on i.MX6Q/DL. 252 on i.MX6Q/DL.
253 253
254 config DEBUG_IMX6SL_UART
255 bool "i.MX6SL Debug UART"
256 depends on SOC_IMX6SL
257 help
258 Say Y here if you want kernel low-level debugging support
259 on i.MX6SL.
260
254 config DEBUG_MMP_UART2 261 config DEBUG_MMP_UART2
255 bool "Kernel low-level debugging message via MMP UART2" 262 bool "Kernel low-level debugging message via MMP UART2"
256 depends on ARCH_MMP 263 depends on ARCH_MMP
@@ -532,7 +539,8 @@ config DEBUG_IMX_UART_PORT
532 DEBUG_IMX35_UART || \ 539 DEBUG_IMX35_UART || \
533 DEBUG_IMX51_UART || \ 540 DEBUG_IMX51_UART || \
534 DEBUG_IMX53_UART || \ 541 DEBUG_IMX53_UART || \
535 DEBUG_IMX6Q_UART 542 DEBUG_IMX6Q_UART || \
543 DEBUG_IMX6SL_UART
536 default 1 544 default 1
537 depends on ARCH_MXC 545 depends on ARCH_MXC
538 help 546 help
@@ -631,7 +639,8 @@ config DEBUG_LL_INCLUDE
631 DEBUG_IMX35_UART || \ 639 DEBUG_IMX35_UART || \
632 DEBUG_IMX51_UART || \ 640 DEBUG_IMX51_UART || \
633 DEBUG_IMX53_UART ||\ 641 DEBUG_IMX53_UART ||\
634 DEBUG_IMX6Q_UART 642 DEBUG_IMX6Q_UART || \
643 DEBUG_IMX6SL_UART
635 default "debug/mvebu.S" if DEBUG_MVEBU_UART 644 default "debug/mvebu.S" if DEBUG_MVEBU_UART
636 default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART 645 default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
637 default "debug/nomadik.S" if DEBUG_NOMADIK_UART 646 default "debug/nomadik.S" if DEBUG_NOMADIK_UART
diff --git a/arch/arm/include/debug/imx-uart.h b/arch/arm/include/debug/imx-uart.h
index 91d38e38a0b4..29da84e183f4 100644
--- a/arch/arm/include/debug/imx-uart.h
+++ b/arch/arm/include/debug/imx-uart.h
@@ -65,6 +65,14 @@
65#define IMX6Q_UART_BASE_ADDR(n) IMX6Q_UART##n##_BASE_ADDR 65#define IMX6Q_UART_BASE_ADDR(n) IMX6Q_UART##n##_BASE_ADDR
66#define IMX6Q_UART_BASE(n) IMX6Q_UART_BASE_ADDR(n) 66#define IMX6Q_UART_BASE(n) IMX6Q_UART_BASE_ADDR(n)
67 67
68#define IMX6SL_UART1_BASE_ADDR 0x02020000
69#define IMX6SL_UART2_BASE_ADDR 0x02024000
70#define IMX6SL_UART3_BASE_ADDR 0x02034000
71#define IMX6SL_UART4_BASE_ADDR 0x02038000
72#define IMX6SL_UART5_BASE_ADDR 0x02018000
73#define IMX6SL_UART_BASE_ADDR(n) IMX6SL_UART##n##_BASE_ADDR
74#define IMX6SL_UART_BASE(n) IMX6SL_UART_BASE_ADDR(n)
75
68#define IMX_DEBUG_UART_BASE(soc) soc##_UART_BASE(CONFIG_DEBUG_IMX_UART_PORT) 76#define IMX_DEBUG_UART_BASE(soc) soc##_UART_BASE(CONFIG_DEBUG_IMX_UART_PORT)
69 77
70#ifdef CONFIG_DEBUG_IMX1_UART 78#ifdef CONFIG_DEBUG_IMX1_UART
@@ -83,6 +91,8 @@
83#define UART_PADDR IMX_DEBUG_UART_BASE(IMX53) 91#define UART_PADDR IMX_DEBUG_UART_BASE(IMX53)
84#elif defined(CONFIG_DEBUG_IMX6Q_UART) 92#elif defined(CONFIG_DEBUG_IMX6Q_UART)
85#define UART_PADDR IMX_DEBUG_UART_BASE(IMX6Q) 93#define UART_PADDR IMX_DEBUG_UART_BASE(IMX6Q)
94#elif defined(CONFIG_DEBUG_IMX6SL_UART)
95#define UART_PADDR IMX_DEBUG_UART_BASE(IMX6SL)
86#endif 96#endif
87 97
88#endif /* __DEBUG_IMX_UART_H */ 98#endif /* __DEBUG_IMX_UART_H */