]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
ARM: debug-ll: fix BCM63xx entry for multiplatform
authorArnd Bergmann <arnd@arndb.de>
Mon, 18 Jan 2016 09:45:00 +0000 (10:45 +0100)
committerTim Gardner <tim.gardner@canonical.com>
Wed, 6 Apr 2016 09:22:16 +0000 (10:22 +0100)
commita563806ac8b780cb6a50cfeea2c399de3d53ad6f
tree14e989d85809b4950d5b4a5cf69e7c0078e10a08
parentac1035c243f2d8316dae584657c52c75a98222f0
ARM: debug-ll: fix BCM63xx entry for multiplatform

BugLink: http://bugs.launchpad.net/bugs/1553179
commit 6c54809977de3c9e2ef9e9934a2c6625f7e161e7 upstream.

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: Arnd Bergmann <arnd@arndb.de>
Fixes: b51312bebfa4 ("ARM: BCM63XX: add low-level UART debug support")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
arch/arm/Kconfig.debug