lkml.org 
[lkml]   [2016]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 167/268] ARM: debug-ll: fix BCM63xx entry for multiplatform
    Date
    4.2.8-ckt3 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Arnd Bergmann <arnd@arndb.de>

    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 <arnd@arndb.de>
    Fixes: b51312bebfa4 ("ARM: BCM63XX: add low-level UART debug support")
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    arch/arm/Kconfig.debug | 17 ++++++-----------
    1 file changed, 6 insertions(+), 11 deletions(-)

    diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
    index a2e16f9..55ef850 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"
    @@ -1343,7 +1342,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"

    @@ -1359,10 +1358,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
    @@ -1457,7 +1452,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 || \
    @@ -1469,7 +1464,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

    config DEBUG_UART_VIRT
    @@ -1509,7 +1504,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
    @@ -1560,7 +1555,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
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-01-27 22:41    [W:4.176 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site