From mboxrd@z Thu Jan 1 00:00:00 1970 From: rdunlap@infradead.org (Randy Dunlap) Date: Mon, 18 Jan 2016 09:41:17 -0800 Subject: [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform In-Reply-To: <5641204.G6RtGs3Kji@wuerfel> References: <5641204.G6RtGs3Kji@wuerfel> Message-ID: <569D23BD.9050506@infradead.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756133AbcARRl5 (ORCPT ); Mon, 18 Jan 2016 12:41:57 -0500 Received: from casper.infradead.org ([85.118.1.10]:36917 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756010AbcARRlZ (ORCPT ); Mon, 18 Jan 2016 12:41:25 -0500 Subject: Re: [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform To: Arnd Bergmann , Florian Fainelli References: <5641204.G6RtGs3Kji@wuerfel> Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org From: Randy Dunlap Message-ID: <569D23BD.9050506@infradead.org> Date: Mon, 18 Jan 2016 09:41:17 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <5641204.G6RtGs3Kji@wuerfel> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Fixes: b51312bebfa4 ("ARM: BCM63XX: add low-level UART debug support") > Cc: stable@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