diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 11:02:01 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 11:02:01 +0100 |
| commit | 688de98f3488b55b333601030c790a923183169d (patch) | |
| tree | e2dd246b7630082ba037860e7dc2e3edadf31061 /arch/arm/configs | |
| parent | 4ba845dad9b90ca9137cdfec3d61cb8c7002f033 (diff) | |
| parent | 675a157c61f756affbbc2569c55dc5719342081b (diff) | |
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
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 2adef49d1b24..6b68fc8826d5 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -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 |