Commit b0100bce authored by Lukas Bulwahn's avatar Lukas Bulwahn Committed by Shawn Guo
Browse files

ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART 



Since commit 4b563a06 ("ARM: imx: Remove imx21 support"), the config
DEBUG_IMX21_IMX27_UART is really only debug support for IMX27.

So, rename this option to DEBUG_IMX27_UART and adjust dependencies in
Kconfig and rename the definitions to IMX27 as further clean-up.

This issue was discovered with ./scripts/checkkconfigsymbols.py, which
reported that DEBUG_IMX21_IMX27_UART depends on the non-existing config
SOC_IMX21.

Signed-off-by: default avatarLukas Bulwahn <lukas.bulwahn@gmail.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent efe33bef

arch/arm/Kconfig.debug

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

		  on i.MX25.



	config DEBUG_IMX21_IMX27_UART

		bool "i.MX21 and i.MX27 Debug UART"

		depends on SOC_IMX21 || SOC_IMX27

	config DEBUG_IMX27_UART

		bool "i.MX27 Debug UART"

		depends on SOC_IMX27

		help

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

		  on i.MX21 or i.MX27.

		  on i.MX27.



	config DEBUG_IMX28_UART

		bool "i.MX28 Debug UART"
@@ -1481,7 +1481,7 @@ config DEBUG_IMX_UART_PORT 
	int "i.MX Debug UART Port Selection"

	depends on DEBUG_IMX1_UART || \

		   DEBUG_IMX25_UART || \

		   DEBUG_IMX21_IMX27_UART || \

		   DEBUG_IMX27_UART || \

		   DEBUG_IMX31_UART || \

		   DEBUG_IMX35_UART || \

		   DEBUG_IMX50_UART || \
@@ -1540,7 +1540,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/icedcc.S" if DEBUG_ICEDCC

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

				 DEBUG_IMX25_UART || \

				 DEBUG_IMX21_IMX27_UART || \

				 DEBUG_IMX27_UART || \

				 DEBUG_IMX31_UART || \

				 DEBUG_IMX35_UART || \

				 DEBUG_IMX50_UART || \

arch/arm/include/debug/imx-uart.h

+9 −9
Original line number Diff line number Diff line
@@ -11,13 +11,6 @@ 
#define IMX1_UART_BASE_ADDR(n)	IMX1_UART##n##_BASE_ADDR

#define IMX1_UART_BASE(n)	IMX1_UART_BASE_ADDR(n)



#define IMX21_UART1_BASE_ADDR	0x1000a000

#define IMX21_UART2_BASE_ADDR	0x1000b000

#define IMX21_UART3_BASE_ADDR	0x1000c000

#define IMX21_UART4_BASE_ADDR	0x1000d000

#define IMX21_UART_BASE_ADDR(n)	IMX21_UART##n##_BASE_ADDR

#define IMX21_UART_BASE(n)	IMX21_UART_BASE_ADDR(n)



#define IMX25_UART1_BASE_ADDR	0x43f90000

#define IMX25_UART2_BASE_ADDR	0x43f94000

#define IMX25_UART3_BASE_ADDR	0x5000c000
@@ -26,6 +19,13 @@ 
#define IMX25_UART_BASE_ADDR(n)	IMX25_UART##n##_BASE_ADDR

#define IMX25_UART_BASE(n)	IMX25_UART_BASE_ADDR(n)



#define IMX27_UART1_BASE_ADDR	0x1000a000

#define IMX27_UART2_BASE_ADDR	0x1000b000

#define IMX27_UART3_BASE_ADDR	0x1000c000

#define IMX27_UART4_BASE_ADDR	0x1000d000

#define IMX27_UART_BASE_ADDR(n)	IMX27_UART##n##_BASE_ADDR

#define IMX27_UART_BASE(n)	IMX27_UART_BASE_ADDR(n)



#define IMX31_UART1_BASE_ADDR	0x43f90000

#define IMX31_UART2_BASE_ADDR	0x43f94000

#define IMX31_UART3_BASE_ADDR	0x5000c000
@@ -112,10 +112,10 @@ 


#ifdef CONFIG_DEBUG_IMX1_UART

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX1)

#elif defined(CONFIG_DEBUG_IMX21_IMX27_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX21)

#elif defined(CONFIG_DEBUG_IMX25_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX25)

#elif defined(CONFIG_DEBUG_IMX27_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX27)

#elif defined(CONFIG_DEBUG_IMX31_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX31)

#elif defined(CONFIG_DEBUG_IMX35_UART)