From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756496AbcARTjZ (ORCPT ); Mon, 18 Jan 2016 14:39:25 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:62225 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756326AbcARTjX (ORCPT ); Mon, 18 Jan 2016 14:39:23 -0500 From: Arnd Bergmann To: Randy Dunlap Cc: Florian Fainelli , arm@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform Date: Mon, 18 Jan 2016 20:38:27 +0100 Message-ID: <5297028.MQyTCAGyMJ@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <569D23BD.9050506@infradead.org> References: <5641204.G6RtGs3Kji@wuerfel> <569D23BD.9050506@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:1crRJ/sCYEfxNhgG9KbyT+DtCoTd5gc0TDHgBPlp7ToyzZtx8Wx Yereyx8Sjv5fQ/CFTLOmmXLtwTPEE9MRK2rn2D0VbsxwK+xmo+rDdKSdRcJlymnL1qnd3WQ 5P9WqwXw46y4SzjvZy+yQYkhZ3ak3V9njaqkTDPDV7Jdk4e8Hje640/+pV+LYp9IHqALchc 9TUTMnjEi1z6i6P7UF11g== X-UI-Out-Filterresults: notjunk:1;V01:K0:KrywiNaYfuM=:ZQPZMFinz6vH4meyb1SB4L IwANaDhp73j/SUYrEA9UJ7Rudr6eXRsjjUyaU9g2wwDdVK6vubepOt0RKRCGezbxv6SwSBVGy pnWTvihUzbeeCUb7z3ohHIqXAxGJXhBRadA2P+Lqa9mEUoOHg3d/BgvR8kxq4MhyzEXmRdDck gwg5TySBaPATSUOejQ8TcpuxpIjNRM2v5q7brFNm9o9ypNNhkLN9OdDtb8A7rHDt30wvyCMdD pYcZYB0vmdKqQ3APetVGJgoggXd+pL91QbMO/xU4OLP++OHtsmF9pG98f/XV8l9p+uokbxi+n hCo3uFx0tzU8zY5c+QrncHaceNKSpsZRqoAeumVbWRiN907S5Vm5PMyCnOnGjSiNLGuaPBsiJ Hvuma5oDDFzDCQ2Cc+E3OmQLXD22tT29grFY8fdVp9P7tsHPgi0aG383dzA8L2wyOlIvyds4C IlKkCdL+QzaQyc/2NNNENixKoLLxzVtjilZp7t0zjqKur4agJ+wo4kVWb8Kg/pzLinDE4tQYw 4DsuhG1K2GYeWKik9RKSxzuBbhV6Og3sBP5zHIg/DNk/4fWTdeJsN2ye45VwfkxY9SB2KRHil L2UpGrrwpT2+3Xs6MQ70jxZprHb0dpY6hEHJtDU3RwFi07xek8SgbRUgw5A7iOYB6brw7Njlo URqaQQRJG/xblIGEn6uLvRpZSoH+n57rDXtl3gPeshbH8Kj4QfRzO5sXNUCAb0dx8cStvsVDG 1UwwthP6i6bagep9 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday 18 January 2016 09:41:17 Randy Dunlap wrote: > 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)? > > Sorry about that. I was planning to add some text at first and then saw that most others didn't have one either in this list, so I dropped it again. Curiously, the empty help text actually caused some serious problems later on in my build testing, so this patch creates a regression unless I remove that line again (as I should anyway). Thanks for spotting this as well! Arnd