Skip to content

Commit a983879

Browse files
bulwahnarndb
authored andcommitted
arm: debug: reuse the config DEBUG_OMAP2UART{1,2} for OMAP{3,4,5}
Commit d2b310b ("ARM: debug: Use generic 8250 debug_ll for omap2 and omap3/4/5 common uarts") adds address definitions of DEBUG_UART_PHYS for OMAP2, OMAP3, OMAP4 and OMAP5 in ./arch/arm/Kconfig.debug. These definitions depend on DEBUG_OMAP{2,3,4,5}UART{1,2}; however, only DEBUG_OMAP2UART{1,2} are defined in ./arch/arm/Kconfig.debug, and DEBUG_OMAP{3,4,5}UART{1,2} are not defined. Hence, the script ./scripts/checkkconfigsymbols.py warns here on non-existing symbols. Simply reuse the config DEBUG_OMAP2UART{1,2}; there is no need to define separate config symbols for OMAP{3,4,5}. So, just delete the dead references to DEBUG_OMAP{3,4,5}UART{1,2}. Signed-off-by: Lukas Bulwahn <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
1 parent f46ada0 commit a983879

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

arch/arm/Kconfig.debug

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,10 +1593,8 @@ config DEBUG_UART_PHYS
15931593
default 0x48020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1
15941594
default 0x48022000 if DEBUG_TI81XXUART2
15951595
default 0x48024000 if DEBUG_TI81XXUART3
1596-
default 0x4806a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \
1597-
DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1
1598-
default 0x4806c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \
1599-
DEBUG_OMAP4UART2 || DEBUG_OMAP5UART2
1596+
default 0x4806a000 if DEBUG_OMAP2UART1
1597+
default 0x4806c000 if DEBUG_OMAP2UART2
16001598
default 0x4806e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4
16011599
default 0x49020000 if DEBUG_OMAP3UART3
16021600
default 0x49042000 if DEBUG_OMAP3UART4
@@ -1719,10 +1717,8 @@ config DEBUG_UART_VIRT
17191717
default 0xfa020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1
17201718
default 0xfa022000 if DEBUG_TI81XXUART2
17211719
default 0xfa024000 if DEBUG_TI81XXUART3
1722-
default 0xfa06a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \
1723-
DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1
1724-
default 0xfa06c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \
1725-
DEBUG_OMAP4UART2 || DEBUG_OMAP5UART2
1720+
default 0xfa06a000 if DEBUG_OMAP2UART1
1721+
default 0xfa06c000 if DEBUG_OMAP2UART2
17261722
default 0xfa06e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4
17271723
default 0xfa71e000 if DEBUG_QCOM_UARTDM
17281724
default 0xfb009000 if DEBUG_REALVIEW_STD_PORT

0 commit comments

Comments
 (0)