tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: imx: add low-level debug support for imx6sx

Enable low-level debug support for i.MX6 SoloX by adding the debug
port definitions for the SoC.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>

Shawn Guo 74368e81 8da4d6b2

+22 -2
+11 -2
arch/arm/Kconfig.debug
··· 317 317 Say Y here if you want kernel low-level debugging support 318 318 on i.MX6SL. 319 319 320 + config DEBUG_IMX6SX_UART 321 + bool "i.MX6SX Debug UART" 322 + depends on SOC_IMX6SX 323 + help 324 + Say Y here if you want kernel low-level debugging support 325 + on i.MX6SX. 326 + 320 327 config DEBUG_KEYSTONE_UART0 321 328 bool "Kernel low-level debugging on KEYSTONE2 using UART0" 322 329 depends on ARCH_KEYSTONE ··· 942 935 DEBUG_IMX51_UART || \ 943 936 DEBUG_IMX53_UART || \ 944 937 DEBUG_IMX6Q_UART || \ 945 - DEBUG_IMX6SL_UART 938 + DEBUG_IMX6SL_UART || \ 939 + DEBUG_IMX6SX_UART 946 940 default 1 947 941 depends on ARCH_MXC 948 942 help ··· 987 979 DEBUG_IMX51_UART || \ 988 980 DEBUG_IMX53_UART ||\ 989 981 DEBUG_IMX6Q_UART || \ 990 - DEBUG_IMX6SL_UART 982 + DEBUG_IMX6SL_UART || \ 983 + DEBUG_IMX6SX_UART 991 984 default "debug/msm.S" if DEBUG_MSM_UART 992 985 default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART 993 986 default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
+11
arch/arm/include/debug/imx-uart.h
··· 81 81 #define IMX6SL_UART_BASE_ADDR(n) IMX6SL_UART##n##_BASE_ADDR 82 82 #define IMX6SL_UART_BASE(n) IMX6SL_UART_BASE_ADDR(n) 83 83 84 + #define IMX6SX_UART1_BASE_ADDR 0x02020000 85 + #define IMX6SX_UART2_BASE_ADDR 0x021e8000 86 + #define IMX6SX_UART3_BASE_ADDR 0x021ec000 87 + #define IMX6SX_UART4_BASE_ADDR 0x021f0000 88 + #define IMX6SX_UART5_BASE_ADDR 0x021f4000 89 + #define IMX6SX_UART6_BASE_ADDR 0x022a0000 90 + #define IMX6SX_UART_BASE_ADDR(n) IMX6SX_UART##n##_BASE_ADDR 91 + #define IMX6SX_UART_BASE(n) IMX6SX_UART_BASE_ADDR(n) 92 + 84 93 #define IMX_DEBUG_UART_BASE(soc) soc##_UART_BASE(CONFIG_DEBUG_IMX_UART_PORT) 85 94 86 95 #ifdef CONFIG_DEBUG_IMX1_UART ··· 112 103 #define UART_PADDR IMX_DEBUG_UART_BASE(IMX6Q) 113 104 #elif defined(CONFIG_DEBUG_IMX6SL_UART) 114 105 #define UART_PADDR IMX_DEBUG_UART_BASE(IMX6SL) 106 + #elif defined(CONFIG_DEBUG_IMX6SX_UART) 107 + #define UART_PADDR IMX_DEBUG_UART_BASE(IMX6SX) 115 108 #endif 116 109 117 110 #endif /* __DEBUG_IMX_UART_H */