Merge tag 'arm-soc/for-4.15/defconfig' of http://github.com/Broadcom/stblinux into next/soc · 688de98f34 - Gogs: Go Git Service GfA electronic

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

Arnd Bergmann 8 years ago

parent

4ba845dad9 675a157c61

commit

688de98f34

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
arch/arm/configs/multi_v7_defconfig
							 
								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