Commit 59bd4c38 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: debug-ll: rework lpc32xx handling 



LPC32xx can not yet be configured in a multiplatform kernel, but
if we ever get there, enabling one of the LPC32xx platforms
while trying to use DEBUG_LL for another platform can default to
the wrong UART address, as the options are purely based on the
architecture being enabled or not.

This changes the logic to use the LPC32xx default addresses only
if we have also picked the respective Kconfig symbols introduced
here.

While we're at it, this also reorders the virtual address as
it should be.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarVladimir Zapolskiy <vz@mleia.com>
parent d7175a3b

arch/arm/Kconfig.debug

+11 −3
Original line number Diff line number Diff line
@@ -480,6 +480,14 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on NXP LPC18xx/43xx UART0.



	config DEBUG_LPC32XX

		bool "Kernel low-level debugging messages via NXP LPC32xx UART"

		depends on ARCH_LPC32XX

		select DEBUG_UART_8250

		help

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

		  on NXP LPC32xx based platforms.



	config DEBUG_MESON_UARTAO

		bool "Kernel low-level debugging via Meson6 UARTAO"

		depends on ARCH_MESON
@@ -1418,7 +1426,7 @@ config DEBUG_UART_PL01X 
config DEBUG_UART_8250

	def_bool ARCH_EBSA110 || (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \

		ARCH_IOP13XX || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || \

		ARCH_LPC32XX || ARCH_RPC

		ARCH_RPC



# Compatibility options for BCM63xx

config DEBUG_UART_BCM63XX
@@ -1461,7 +1469,7 @@ config DEBUG_UART_PHYS 
	default 0x3e000000 if DEBUG_BCM_KONA_UART

	default 0x4000e400 if DEBUG_LL_UART_EFM32

	default 0x40081000 if DEBUG_LPC18XX_UART0

	default 0x40090000 if ARCH_LPC32XX

	default 0x40090000 if DEBUG_LPC32XX

	default 0x40100000 if DEBUG_PXA_UART1

	default 0x42000000 if DEBUG_GEMINI

	default 0x50000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \
@@ -1549,9 +1557,9 @@ config DEBUG_UART_VIRT 
	default 0xf1c28000 if DEBUG_SUNXI_UART0

	default 0xf1c28400 if DEBUG_SUNXI_UART1

	default 0xf1f02800 if DEBUG_SUNXI_R_UART

	default 0xf4090000 if DEBUG_LPC32XX

	default 0xf4200000 if DEBUG_GEMINI

	default 0xf6200000 if DEBUG_PXA_UART1

	default 0xf4090000 if ARCH_LPC32XX

	default 0xf7000000 if DEBUG_SUN9I_UART0

	default 0xf7000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \

				DEBUG_S3C2410_UART0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE