From patchwork Mon Jan 18 09:51:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101162 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1897428lbb; Mon, 18 Jan 2016 01:51:43 -0800 (PST) X-Received: by 10.66.156.134 with SMTP id we6mr35044267pab.92.1453110703467; Mon, 18 Jan 2016 01:51:43 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y11si1229493pas.239.2016.01.18.01.51.43; Mon, 18 Jan 2016 01:51:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754377AbcARJvk (ORCPT + 29 others); Mon, 18 Jan 2016 04:51:40 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:52815 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753418AbcARJvh (ORCPT ); Mon, 18 Jan 2016 04:51:37 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue005) with ESMTPSA (Nemesis) id 0LlrOO-1Zlle34A1w-00ZR6U; Mon, 18 Jan 2016 10:51:04 +0100 From: Arnd Bergmann To: Florian Fainelli Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: debug-ll: fix BCM63xx entry for multiplatform Date: Mon, 18 Jan 2016 10:51 +0100 Message-ID: <5641204.G6RtGs3Kji@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:lwAEetruerxgTGu0j8UTjzTTpAiMqI4OUXe4EmhSS8DUdFv1T6H W3j1OrNsQhfmuy9DZfXVZDir/7DBwuCUu/rLSLOW0A/+g327CP5oQ85KKoEooZHEJu+9BSq 7/0OfPSAlqT8s8nr5pZxp4EKTtrxpUxNAgsgxSsKD8EeCKThlQsgsFUhadtY0hlIcPiY7jN KFicFgUlDvd5pWg5pN88Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:IoCTx/7yCyw=:uCswI6M7klg21dWvkEufbA wQS+Y71S+BtlPTWR34AQW/iBterMMU3aa6M3ODA0s70XDur5AKv1P4SiW+6j7GF3C7KW7fhMW HWoJ0Qrs0SQdV6oZoy5wvpMH4R6zT2JHwT5MDTK5NDXnpqhMQbvmK5feyydLwr0X0CLxM0pzz ZrTIaywJMwUImH6OTRSjAlUyoW0DzgyIxzsnk4DoCA3FAsKU5Y3jbtNYp+VycnHNsymJ+A846 Kkj8FToA691x7/t6/Xzlnb6sG2DAHemurdyDqGUBIZw7DRSMeiX+dHgjLTlQTYL+2/pWN9FIv o3zXV2ziI1Q4e7o94TEjRIPLspbMG6MyEzz8lx0Bu4QL4adUOmZ5w4py9eFnek4mWzTk13tMr /Ojg/8HW3Vu0FmWZTUiaOQAlkXe7cAQHhlPBTyjcbT5uwYfdz/jHLZJ3ig4nWsupR33WMlkh2 9xQuj5jngfx5YZZ+/8swuZLjsgjNjtNMogzmp5k0FCVQUace8g3LssirrzI4U2IxH1Allh/r7 Fk5NPgHWrv1a1R5pyrsyztjKBkiGNZxwelyHGH1JlEsuIpkNfCSaCpG3++iRUrAaej/+IkUcX wVhm1FixjwmB8Os2UtAhjWFCzY5uYcj7TSNHnm4ytPvbkQRyKiAMC3RwoRkYLe2eOBR05t/VU LmADAKL2vO845e19Bx6D/Nh+CA9kMo//+35j6Zdw/61nblQEdo8dR0gFeoUPIegHZh6/xTRvm lJ7vQfank2DkmjOG Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-by: Florian Fainelli 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 config DEBUG_BERLIN_UART bool "Marvell Berlin SoC Debug UART" @@ -1414,7 +1414,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" @@ -1428,10 +1428,6 @@ config DEBUG_UART_8250 ARCH_IOP13XX || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || \ 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 @@ -1529,7 +1525,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 default 0 depends on ARCH_EP93XX || \ @@ -1543,7 +1539,7 @@ config DEBUG_UART_PHYS DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \ DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \ DEBUG_S3C64XX_UART || \ - DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \ + DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \ DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \ DEBUG_AT91_UART @@ -1589,7 +1585,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 DEBUG_SPEAR3XX || DEBUG_SPEAR13XX default 0xfd883000 if DEBUG_ALPINE_UART0 default 0xfe017000 if DEBUG_MMP_UART2 @@ -1637,7 +1633,7 @@ config DEBUG_UART_VIRT DEBUG_NETX_UART || \ DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \ DEBUG_S3C64XX_UART || \ - DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \ + DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \ DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 config DEBUG_UART_8250_SHIFT