diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 15:33:54 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 16:09:25 +0200 |
| commit | 147de9757d49768b1163bcb02eb86039628ab47f (patch) | |
| tree | 76d13905dd49b1cdceb417d42fb14fecc1e71433 | |
| parent | 800daa61a3f20d7ea2243621985ff5744eb2f246 (diff) | |
| parent | 2dc9e0b9f162af7e2047176a31716eac5301916f (diff) | |
Merge tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux into next/soc
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
| -rw-r--r-- | arch/arm/Kconfig.debug | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index ba4003e687ac..a9693b6987a6 100644 --- 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 |