Merge tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux into...

Merge "the second part of the Broadcom ARM-based SoC changes" from Florian Fainelli:

- Florian updates the DEBUG_UART_BCM5301X entry to cover both NS and NSP SoCs
  since they both have the same location

* tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux:
  ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index ba4003e687ac5cf39c4020a94864ec8879bfb757..a9693b6987a6e41c69702f1003d0d8bd2279530e 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -156,8 +156,8 @@ choice
                select DEBUG_UART_PL01X
 
        config DEBUG_BCM_5301X
-               bool "Kernel low-level debugging on BCM5301X UART1"
-               depends on ARCH_BCM_5301X
+               bool "Kernel low-level debugging on BCM5301X/NSP UART1"
+               depends on ARCH_BCM_5301X || ARCH_BCM_NSP
                select DEBUG_UART_8250
 
        config DEBUG_BCM_KONA_UART