Merge tag 'arm-soc/for-4.15/defconfig' of http://github.com/Broadcom/stblinux into next/soc

Pull "Broadcom defconfig changes for 4.15" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoCs multi_v7_defconfig file
updates for 4.15, please pull the following:

- Florian enables the Broadcom Hurricane 2 SoC in multi_v7_defconfig
  (CONFIG_ARCH_BCM_HR2)

* tag 'arm-soc/for-4.15/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: multi_v7_defconfig: Enable CONFIG_ARCH_BCM_HR2
This commit is contained in:
Arnd Bergmann
2017-10-30 11:02:01 +01:00
+1
View File
@@ -31,6 +31,7 @@ CONFIG_SOC_SAMA5D3=y
CONFIG_SOC_SAMA5D4=y
CONFIG_ARCH_BCM=y
CONFIG_ARCH_BCM_CYGNUS=y
CONFIG_ARCH_BCM_HR2=y
CONFIG_ARCH_BCM_NSP=y
CONFIG_ARCH_BCM_21664=y
CONFIG_ARCH_BCM_281XX=y