From patchwork Wed Feb 24 09:26:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102689 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2292965lbl; Wed, 24 Feb 2016 01:26:45 -0800 (PST) X-Received: by 10.98.93.211 with SMTP id n80mr53651878pfj.61.1456306005153; Wed, 24 Feb 2016 01:26:45 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vz3si3743742pab.93.2016.02.24.01.26.44; Wed, 24 Feb 2016 01:26:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750769AbcBXJ0m (ORCPT + 3 others); Wed, 24 Feb 2016 04:26:42 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:60160 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750704AbcBXJ0j (ORCPT ); Wed, 24 Feb 2016 04:26:39 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue103) with ESMTPA (Nemesis) id 0MOlGA-1acKwF2Kr0-0063a7; Wed, 24 Feb 2016 10:26:37 +0100 From: Arnd Bergmann To: stable@vger.kernel.org Cc: Arnd Bergmann Subject: [BACKPORT v4.4-stable] ARM: debug-ll: fix BCM63xx entry for multiplatform Date: Wed, 24 Feb 2016 10:26:35 +0100 Message-Id: <1456305995-3173827-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:5sJoickNkFLqsZTfCFkpduH/2mptUtXYIwQbO5Me68wA2eYEds7 YIqRl1Vtuw607VFFIFhnOygi3wKhs1bqVk0pzK+4nYxVaGTMSexGiAnnXxPrwm057067lUG YzkF9J4aJqZK4xYz4iHCuWrvWSAumSxi/sGWU1uv4G2mlqp3U/JogMxcRE7GppzqsnK8M6H JmWcMQNZ8xmKLMhf9A8lw== X-UI-Out-Filterresults: notjunk:1; V01:K0:5+sG3/IGPjg=:/etMVLonN7+FEXOH7AAoQz ZA0x3EfR5Peq/7FJEekSIKMuc6fa9O9x3zSuf32zGarJU6zuchgf6QFq+cRF6X5c0Wb3raRZG /wqlhkKZXtHgDrON0ICONUyf4uwFD/6U7RRD73t3BNGQjgo+o4GY9n71Ul8bYQC1I8hzlzK0N z215NzoN0bAlevB3oVtpn3QuT3bFK7sGjHoreIGVfoZP8dQNBdeXhVMQvv5n9zIo1nfn57nNv p7Ln2odF1Fqv4v/WxZ/z2p9AxBEd9iFy+BqqfD0pOcYsxDwWdtTI5E3wk4efcztpioWZ2yrsS xz5rkGmy9j95HpqqW5MRr4jFmVZQwBcae6+kWmAhnCubO86zHuoxU7tUZY+2sabEWi7G/WPEn vw5YP8KotPbreICyeJCBt/MEmZ47lYw1ZMxf2khWYEvdh7c48CCvp1KnRvVGF8ppen92tvJjA p7QX1Y29FrQqPLdiN8AXg+fYW+MEF1uwegs9a14+HzvATOL3JCBtl0yCsrftu+YZeXp7RFNBe lnfqMlJ9nhV6ETtv+5m26braehHCYhI+c7xWHb1munamnPz2aWihL6K5oacgyI06x0ezxJDop mKezOqjiLaSluAFHZVV/K3wLcPhHQy+rLDHLb4zL7kS4Er8MEwTu+PF45o/McQ9BV9beT9Nxc tDbXpfWcnrt6FH1OK9tc6GoHvAjx87z5p2MHQUGvYPKyFDuCfHWz449ggTrHiSQ1kLVw= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 Fixes: b51312bebfa4 ("ARM: BCM63XX: add low-level UART debug support") Cc: stable@vger.kernel.org --- arch/arm/Kconfig.debug | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) -- 2.7.0 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 259c0ca9c99a..ddbb361267d8 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -162,10 +162,9 @@ 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 config DEBUG_BERLIN_UART bool "Marvell Berlin SoC Debug UART" @@ -1348,7 +1347,7 @@ config DEBUG_LL_INCLUDE default "debug/vf.S" if DEBUG_VF_UART default "debug/vt8500.S" if DEBUG_VT8500_UART0 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 "mach/debug-macro.S" @@ -1364,10 +1363,6 @@ config DEBUG_UART_8250 ARCH_IOP33X || ARCH_IXP4XX || \ ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC -# Compatibility options for BCM63xx -config DEBUG_UART_BCM63XX - def_bool ARCH_BCM_63XX - config DEBUG_UART_PHYS hex "Physical base address of debug UART" default 0x00100a00 if DEBUG_NETX_UART @@ -1462,7 +1457,7 @@ config DEBUG_UART_PHYS default 0xfffb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1 default 0xfffb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2 default 0xfffb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3 - default 0xfffe8600 if DEBUG_UART_BCM63XX + default 0xfffe8600 if DEBUG_BCM63XX_UART default 0xfffff700 if ARCH_IOP33X depends on ARCH_EP93XX || \ DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \ @@ -1474,7 +1469,7 @@ config DEBUG_UART_PHYS DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF2 || \ DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \ DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \ - DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \ + DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \ DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \ DEBUG_AT91_UART @@ -1515,7 +1510,7 @@ config DEBUG_UART_VIRT default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT default 0xfc40ab00 if DEBUG_BRCMSTB_UART default 0xfc705000 if DEBUG_ZTE_ZX - default 0xfcfe8600 if DEBUG_UART_BCM63XX + default 0xfcfe8600 if DEBUG_BCM63XX_UART default 0xfd000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX default 0xfd000000 if ARCH_SPEAR13XX default 0xfd012000 if ARCH_MV78XX0 @@ -1566,7 +1561,7 @@ config DEBUG_UART_VIRT DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \ DEBUG_NETX_UART || \ DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \ - DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \ + DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \ DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 config DEBUG_UART_8250_SHIFT