Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45624a6e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents c975bd7e 37eb56dc

arch/arm64/Kconfig.platforms

+7 −0
Original line number Diff line number Diff line
@@ -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