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

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

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

Merge "Broadcom defconfig-arm64 changes for 4.6" from Florian Fainelli:

This pull request contains ARM64 defconfig changes for Broadcom SoCs:

- Jayachandran C enables the newly introduced Broadcom Vulcan SoC to the ARM64
  defconfig

* tag 'arm-soc/for-4.6/defconfig-arm64' of http://github.com/Broadcom/stblinux:
  arm64: defconfig: Add Broadcom Vulcan to defconfig
parents 5e2837a5 4cf430ee

arch/arm64/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ CONFIG_ARCH_SPRD=y 
CONFIG_ARCH_THUNDER=y

CONFIG_ARCH_UNIPHIER=y

CONFIG_ARCH_VEXPRESS=y

CONFIG_ARCH_VULCAN=y

CONFIG_ARCH_XGENE=y

CONFIG_ARCH_ZYNQMP=y

CONFIG_PCI=y