Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit cdaf29cfd8d76bc6133b1a1d127d029a966df66c

Authored by Dirk Behme
Committed by Shawn Guo
1 parent 6b21d18ed5
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ARM: imx6: Rename DEBUG_IMX6Q_UART to UART4 

Different boards may use differenct UART ports for debugging.
To be able to add different debug UART configurations (e.g. UART2),
rename the existing general DEBUG_IMX6Q_UART to DEBUG_IMX6Q_UART4.

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

Showing 3 changed files with 5 additions and 5 deletions Side-by-side Diff

arch/arm/Kconfig.debug
Diff comments   View file @ cdaf29c
... ... @@ -199,12 +199,12 @@
199 199 Say Y here if you want kernel low-level debugging support
200 200 on i.MX50 or i.MX53.
201 201  
202   - config DEBUG_IMX6Q_UART
203   - bool "i.MX6Q Debug UART"
  202 + config DEBUG_IMX6Q_UART4
  203 + bool "i.MX6Q Debug UART4"
204 204 depends on SOC_IMX6Q
205 205 help
206 206 Say Y here if you want kernel low-level debugging support
207   - on i.MX6Q.
  207 + on i.MX6Q UART4.
208 208  
209 209 config DEBUG_S3C_UART0
210 210 depends on PLAT_SAMSUNG
arch/arm/mach-imx/lluart.c
Diff comments   View file @ cdaf29c
... ... @@ -17,7 +17,7 @@
17 17 #include <mach/hardware.h>
18 18  
19 19 static struct map_desc imx_lluart_desc = {
20   -#ifdef CONFIG_DEBUG_IMX6Q_UART
  20 +#ifdef CONFIG_DEBUG_IMX6Q_UART4
21 21 .virtual = MX6Q_IO_P2V(MX6Q_UART4_BASE_ADDR),
22 22 .pfn = __phys_to_pfn(MX6Q_UART4_BASE_ADDR),
23 23 .length = MX6Q_UART4_SIZE,
arch/arm/plat-mxc/include/mach/debug-macro.S
Diff comments   View file @ cdaf29c
... ... @@ -24,7 +24,7 @@
24 24 #define UART_PADDR MX51_UART1_BASE_ADDR
25 25 #elif defined (CONFIG_DEBUG_IMX50_IMX53_UART)
26 26 #define UART_PADDR MX53_UART1_BASE_ADDR
27   -#elif defined (CONFIG_DEBUG_IMX6Q_UART)
  27 +#elif defined (CONFIG_DEBUG_IMX6Q_UART4)
28 28 #define UART_PADDR MX6Q_UART4_BASE_ADDR
29 29 #endif
30 30