diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-15 00:10:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-15 00:10:22 +0200 |
| commit | 45624a6eb15d031363715baf51ace8a67e631ca0 (patch) | |
| tree | 2150513fef93bf42ba94b37178431096af448da1 | |
| parent | c975bd7ef5c0a03c1af4373f5506773519d45a96 (diff) | |
| parent | 37eb56dc79a8e841f3801f9364de8a70189c306f (diff) | |
Merge tag 'arm-soc/for-4.9/soc-arm64' of http://github.com/Broadcom/stblinux into next/arm64
Pull "Broadcom soc-arm64 changes for 4.9" from Florian Fainelli:
This pull request contains Broadcom ARM64-based SoC changes for 4.9, please pull
the following:
- collective effort from Florian, Doug and Markus to add the ARCH_BRCMSTB Kconfig
symbol to the ARM64 kernel build, which is purposedly the same as the ARM/Linux
one in order not to update any driver dependencies
* tag 'arm-soc/for-4.9/soc-arm64' of http://github.com/Broadcom/stblinux:
arm64: Add Broadcom Set Top Box Kconfig entry point
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index f84894656c7a..1c84fb58cc1b 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -42,6 +42,13 @@ config ARCH_BERLIN help This enables support for Marvell Berlin SoC Family +config ARCH_BRCMSTB + bool "Broadcom Set-Top-Box SoCs" + select BRCMSTB_L2_IRQ + select GENERIC_IRQ_CHIP + help + This enables support for Broadcom's ARMv8 Set Top Box SoCs + config ARCH_EXYNOS bool "ARMv8 based Samsung Exynos SoC family" select COMMON_CLK_SAMSUNG |