Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c548099 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: debug-ll: fix BCM63xx entry for multiplatform 



During my randconfig build testing, I found that a kernel with
DEBUG_AT91_UART and ARCH_BCM_63XX fails to build:

arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror]

It turns out that the DEBUG_UART_BCM63XX option is enabled whenever
the ARCH_BCM_63XX is, and that breaks multiplatform kernels because
we then end up using the UART address from BCM63XX rather than the
one we actually configured (if any).

This changes the BCM63XX options to only have one Kconfig option,
and only enable that if the user explicitly turns it on.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: b51312be ("ARM: BCM63XX: add low-level UART debug support")
Cc: stable@vger.kernel.org
parent 2cb58c01

arch/arm/Kconfig.debug

+6 −11
Original line number Original line Diff line number Diff line
@@ -162,10 +162,9 @@ choice 
		  mobile SoCs in the Kona family of chips (e.g. bcm28155,

		  mobile SoCs in the Kona family of chips (e.g. bcm28155,

		  bcm11351, etc...)

		  bcm11351, etc...)





	config DEBUG_BCM63XX

	config DEBUG_BCM63XX_UART

		bool "Kernel low-level debugging on BCM63XX UART"

		bool "Kernel low-level debugging on BCM63XX UART"

		depends on ARCH_BCM_63XX

		depends on ARCH_BCM_63XX

		select DEBUG_UART_BCM63XX





	config DEBUG_BERLIN_UART

	config DEBUG_BERLIN_UART

		bool "Marvell Berlin SoC Debug UART"

		bool "Marvell Berlin SoC Debug UART"
@@ -1423,7 +1422,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/vf.S" if DEBUG_VF_UART

	default "debug/vf.S" if DEBUG_VF_UART

	default "debug/vt8500.S" if DEBUG_VT8500_UART0

	default "debug/vt8500.S" if DEBUG_VT8500_UART0

	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1

	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1

	default "debug/bcm63xx.S" if DEBUG_UART_BCM63XX

	default "debug/bcm63xx.S" if DEBUG_BCM63XX_UART

	default "debug/digicolor.S" if DEBUG_DIGICOLOR_UA0

	default "debug/digicolor.S" if DEBUG_DIGICOLOR_UA0

	default "mach/debug-macro.S"

	default "mach/debug-macro.S"
@@ -1437,10 +1436,6 @@ config DEBUG_UART_8250 
		ARCH_IOP13XX || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || \

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

		ARCH_RPC

		ARCH_RPC





# Compatibility options for BCM63xx

config DEBUG_UART_BCM63XX

	def_bool ARCH_BCM_63XX



config DEBUG_UART_PHYS

config DEBUG_UART_PHYS

	hex "Physical base address of debug UART"

	hex "Physical base address of debug UART"

	default 0x00100a00 if DEBUG_NETX_UART

	default 0x00100a00 if DEBUG_NETX_UART
@@ -1537,7 +1532,7 @@ config DEBUG_UART_PHYS 
	default 0xfffb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1

	default 0xfffb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1

	default 0xfffb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2

	default 0xfffb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2

	default 0xfffb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3

	default 0xfffb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3

	default 0xfffe8600 if DEBUG_UART_BCM63XX

	default 0xfffe8600 if DEBUG_BCM63XX_UART

	default 0xfffff700 if ARCH_IOP33X

	default 0xfffff700 if ARCH_IOP33X

	depends on ARCH_EP93XX || \

	depends on ARCH_EP93XX || \

	        DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \

	        DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
@@ -1550,7 +1545,7 @@ config DEBUG_UART_PHYS 
		DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \

		DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \

		DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \

		DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \

		DEBUG_S3C64XX_UART || \

		DEBUG_S3C64XX_UART || \

		DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \

		DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \

		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \

		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \

		DEBUG_AT91_UART

		DEBUG_AT91_UART
@@ -1596,7 +1591,7 @@ config DEBUG_UART_VIRT 
	default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT

	default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT

	default 0xfc40ab00 if DEBUG_BRCMSTB_UART

	default 0xfc40ab00 if DEBUG_BRCMSTB_UART

	default 0xfc705000 if DEBUG_ZTE_ZX

	default 0xfc705000 if DEBUG_ZTE_ZX

	default 0xfcfe8600 if DEBUG_UART_BCM63XX

	default 0xfcfe8600 if DEBUG_BCM63XX_UART

	default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX

	default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX

	default 0xfd012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_MV78XX0

	default 0xfd012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_MV78XX0

	default 0xfd883000 if DEBUG_ALPINE_UART0

	default 0xfd883000 if DEBUG_ALPINE_UART0
@@ -1646,7 +1641,7 @@ config DEBUG_UART_VIRT 
		DEBUG_NETX_UART || \

		DEBUG_NETX_UART || \

		DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \

		DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \

		DEBUG_S3C64XX_UART || \

		DEBUG_S3C64XX_UART || \

		DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \

		DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \

		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0

		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0





config DEBUG_UART_8250_SHIFT

config DEBUG_UART_8250_SHIFT