Commit cdaf29cf authored by Dirk Behme's avatar Dirk Behme Committed by Shawn Guo
Browse files

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: default avatarDirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 6b21d18e

arch/arm/Kconfig.debug

+3 −3
Original line number Diff line number Diff line
@@ -199,12 +199,12 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on i.MX50 or i.MX53.



	config DEBUG_IMX6Q_UART

		bool "i.MX6Q Debug UART"

	config DEBUG_IMX6Q_UART4

		bool "i.MX6Q Debug UART4"

		depends on SOC_IMX6Q

		help

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

		  on i.MX6Q.

		  on i.MX6Q UART4.



	config DEBUG_S3C_UART0

		depends on PLAT_SAMSUNG

arch/arm/mach-imx/lluart.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <mach/hardware.h>



static struct map_desc imx_lluart_desc = {

#ifdef CONFIG_DEBUG_IMX6Q_UART

#ifdef CONFIG_DEBUG_IMX6Q_UART4

	.virtual	= MX6Q_IO_P2V(MX6Q_UART4_BASE_ADDR),

	.pfn		= __phys_to_pfn(MX6Q_UART4_BASE_ADDR),

	.length		= MX6Q_UART4_SIZE,

arch/arm/plat-mxc/include/mach/debug-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#define UART_PADDR	MX51_UART1_BASE_ADDR

#elif defined (CONFIG_DEBUG_IMX50_IMX53_UART)

#define UART_PADDR	MX53_UART1_BASE_ADDR

#elif defined (CONFIG_DEBUG_IMX6Q_UART)

#elif defined (CONFIG_DEBUG_IMX6Q_UART4)

#define UART_PADDR	MX6Q_UART4_BASE_ADDR

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE