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

Commit bd57a6a9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge "Broadcom defconfig changes for v4.4" from Florian Fainelli:

This pull request contains the following changes for the multi_v7_defconfig:

- Jon adds support for the NorthStar Plus SocS to the multi_v7_defconfig file

* tag 'arm-soc/for-4.4/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: multi_v7_defconfig: Add NSP to defconfig
parents aea843bc de0d5423

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ CONFIG_SOC_SAMA5D3=y 
CONFIG_SOC_SAMA5D4=y

CONFIG_ARCH_BCM=y

CONFIG_ARCH_BCM_CYGNUS=y

CONFIG_ARCH_BCM_NSP=y

CONFIG_ARCH_BCM_21664=y

CONFIG_ARCH_BCM_281XX=y

CONFIG_ARCH_BCM_5301X=y