From: rdunlap@infradead•org (Randy Dunlap)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform
Date: Mon, 18 Jan 2016 09:41:17 -0800 [thread overview]
Message-ID: <569D23BD.9050506@infradead.org> (raw)
In-Reply-To: <5641204.G6RtGs3Kji@wuerfel>
On 01/18/16 01:51, Arnd Bergmann wrote:
> 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")
> Cc: stable at vger.kernel.org
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index c57cbb7e8179..4a2c6a3bc90a 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -153,10 +153,10 @@ choice
> mobile SoCs in the Kona family of chips (e.g. bcm28155,
> bcm11351, etc...)
>
> - config DEBUG_BCM63XX
> + config DEBUG_BCM63XX_UART
> bool "Kernel low-level debugging on BCM63XX UART"
> depends on ARCH_BCM_63XX
> - select DEBUG_UART_BCM63XX
> + help
What's with the empty help message (and lots of trailing whitespace)?
>
> config DEBUG_BERLIN_UART
> bool "Marvell Berlin SoC Debug UART"
--
~Randy
next prev parent reply other threads:[~2016-01-18 17:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-18 9:51 [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform Arnd Bergmann
2016-01-18 9:59 ` Russell King - ARM Linux
2016-01-18 10:42 ` Arnd Bergmann
2016-01-18 17:41 ` Randy Dunlap [this message]
2016-01-18 19:38 ` Arnd Bergmann
2016-01-18 19:07 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=569D23BD.9050506@infradead.org \
--to=rdunlap@infradead$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox