Skip to content

Commit 147de97

Browse files
arndbarndb
committed
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
2 parents 800daa6 + 2dc9e0b commit 147de97

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

‎arch/arm/Kconfig.debug

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ choice
156156
select DEBUG_UART_PL01X
157157

158158
config DEBUG_BCM_5301X
159-
bool "Kernel low-level debugging on BCM5301X UART1"
160-
depends on ARCH_BCM_5301X
159+
bool "Kernel low-level debugging on BCM5301X/NSP UART1"
160+
depends on ARCH_BCM_5301X || ARCH_BCM_NSP
161161
select DEBUG_UART_8250
162162

163163
config DEBUG_BCM_KONA_UART

0 commit comments

Comments
 (0)