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: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART

Since commit 4b563a066611 ("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: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Lukas Bulwahn and committed by
Shawn Guo b0100bce efe33bef

+16 -16
+7 -7
arch/arm/Kconfig.debug
··· 410 410 Say Y here if you want kernel low-level debugging support 411 411 on i.MX25. 412 412 413 - config DEBUG_IMX21_IMX27_UART 414 - bool "i.MX21 and i.MX27 Debug UART" 415 - depends on SOC_IMX21 || SOC_IMX27 413 + config DEBUG_IMX27_UART 414 + bool "i.MX27 Debug UART" 415 + depends on SOC_IMX27 416 416 help 417 417 Say Y here if you want kernel low-level debugging support 418 - on i.MX21 or i.MX27. 418 + on i.MX27. 419 419 420 420 config DEBUG_IMX28_UART 421 421 bool "i.MX28 Debug UART" ··· 1481 1481 int "i.MX Debug UART Port Selection" 1482 1482 depends on DEBUG_IMX1_UART || \ 1483 1483 DEBUG_IMX25_UART || \ 1484 - DEBUG_IMX21_IMX27_UART || \ 1484 + DEBUG_IMX27_UART || \ 1485 1485 DEBUG_IMX31_UART || \ 1486 1486 DEBUG_IMX35_UART || \ 1487 1487 DEBUG_IMX50_UART || \ ··· 1540 1540 default "debug/icedcc.S" if DEBUG_ICEDCC 1541 1541 default "debug/imx.S" if DEBUG_IMX1_UART || \ 1542 1542 DEBUG_IMX25_UART || \ 1543 - DEBUG_IMX21_IMX27_UART || \ 1543 + DEBUG_IMX27_UART || \ 1544 1544 DEBUG_IMX31_UART || \ 1545 1545 DEBUG_IMX35_UART || \ 1546 1546 DEBUG_IMX50_UART || \ 1547 1547 DEBUG_IMX51_UART || \ 1548 - DEBUG_IMX53_UART ||\ 1548 + DEBUG_IMX53_UART || \ 1549 1549 DEBUG_IMX6Q_UART || \ 1550 1550 DEBUG_IMX6SL_UART || \ 1551 1551 DEBUG_IMX6SX_UART || \
+9 -9
arch/arm/include/debug/imx-uart.h
··· 11 11 #define IMX1_UART_BASE_ADDR(n) IMX1_UART##n##_BASE_ADDR 12 12 #define IMX1_UART_BASE(n) IMX1_UART_BASE_ADDR(n) 13 13 14 - #define IMX21_UART1_BASE_ADDR 0x1000a000 15 - #define IMX21_UART2_BASE_ADDR 0x1000b000 16 - #define IMX21_UART3_BASE_ADDR 0x1000c000 17 - #define IMX21_UART4_BASE_ADDR 0x1000d000 18 - #define IMX21_UART_BASE_ADDR(n) IMX21_UART##n##_BASE_ADDR 19 - #define IMX21_UART_BASE(n) IMX21_UART_BASE_ADDR(n) 20 - 21 14 #define IMX25_UART1_BASE_ADDR 0x43f90000 22 15 #define IMX25_UART2_BASE_ADDR 0x43f94000 23 16 #define IMX25_UART3_BASE_ADDR 0x5000c000 ··· 18 25 #define IMX25_UART5_BASE_ADDR 0x5002c000 19 26 #define IMX25_UART_BASE_ADDR(n) IMX25_UART##n##_BASE_ADDR 20 27 #define IMX25_UART_BASE(n) IMX25_UART_BASE_ADDR(n) 28 + 29 + #define IMX27_UART1_BASE_ADDR 0x1000a000 30 + #define IMX27_UART2_BASE_ADDR 0x1000b000 31 + #define IMX27_UART3_BASE_ADDR 0x1000c000 32 + #define IMX27_UART4_BASE_ADDR 0x1000d000 33 + #define IMX27_UART_BASE_ADDR(n) IMX27_UART##n##_BASE_ADDR 34 + #define IMX27_UART_BASE(n) IMX27_UART_BASE_ADDR(n) 21 35 22 36 #define IMX31_UART1_BASE_ADDR 0x43f90000 23 37 #define IMX31_UART2_BASE_ADDR 0x43f94000 ··· 112 112 113 113 #ifdef CONFIG_DEBUG_IMX1_UART 114 114 #define UART_PADDR IMX_DEBUG_UART_BASE(IMX1) 115 - #elif defined(CONFIG_DEBUG_IMX21_IMX27_UART) 116 - #define UART_PADDR IMX_DEBUG_UART_BASE(IMX21) 117 115 #elif defined(CONFIG_DEBUG_IMX25_UART) 118 116 #define UART_PADDR IMX_DEBUG_UART_BASE(IMX25) 117 + #elif defined(CONFIG_DEBUG_IMX27_UART) 118 + #define UART_PADDR IMX_DEBUG_UART_BASE(IMX27) 119 119 #elif defined(CONFIG_DEBUG_IMX31_UART) 120 120 #define UART_PADDR IMX_DEBUG_UART_BASE(IMX31) 121 121 #elif defined(CONFIG_DEBUG_IMX35_UART)