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
This commit is contained in:
commit
147de9757d
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue