Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-24 00:43:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

This pull request contains Broadcom ARM-based defconfig changes for 4.10, please

Browse Source 
pull the following:
 
 - Florian updates the multi_v7_defconfig with the relevant basic drivers needed
   for the Broadcom BCM5301x (Northstar) SoCs to reboot, have PCIe, and Ethernet
 
 - Martin enables the Raspberry Pi thermal driver in bcm2835_defconfig
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJYM9XQAAoJEIfQlpxEBwcEKOoQAK5q4Li17lF6i+Gd9Df831EH
 sBMvlk+6aQv6gB2rZ/1GAw/wGoNxRVMS53kcCQmpAAr8WxzKdPpvmXZtOVlSbHWw
 lkQ65Hj33qhVvpTivykzxUU4ZZJrV2BAN85nx75TJBiGZDMyYi119tkcxinknJmw
 oNLvvgGSxqvpCFQF3L0yNdjNbq599p277jp+Kzet6/2+GmelSCFm7mTC5cleaZKr
 kFkgBEQQCoyVl5EqdPIpHQiVQnyMxfrIKiMo14xnk8hmFjeoyKeidobGbkujwZJr
 7kGTkRHP3uaFkmnzxBwMZv8b/qvvYrpTYLe0ryBJ+SDZDkpJSC5D+EIzok+vAqr5
 4I2Cl6WuFtOwSbZsJvQEXrHNdV+XJ4xxXH5Mh/dv4MmscD7MCWn6PX5RGvPbWxQp
 HleXXf2Z3X4k+6VXx0J4WiMdQyqzSLIxsJPG7z8uFlvX3nSbOYL67a+bRMdngpdB
 GoxSj6jFcJZUMkPyH3acr1XV1o49T4vW0SxhehLQx9rFFJ8BqH4rCBRxC7j+qkiR
 +ov+dpygnLu6OvzGFKbeVRQV1Fhf7uDbRkSByv9atHF+GD8K927JsUhl/RxGglo4
 uRxMPffemv6V5RYqu+sKbiCEDYW0v4DyhhQs/iLxswcjxFNIAhLfAGrTCS0xjDVm
 /5C45Bd+RM+M/avBPnn3
 =Tf8a
 -----END PGP SIGNATURE-----

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

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

This pull request contains Broadcom ARM-based defconfig changes for 4.10, please
pull the following:

- Florian updates the multi_v7_defconfig with the relevant basic drivers needed
  for the Broadcom BCM5301x (Northstar) SoCs to reboot, have PCIe, and Ethernet

- Martin enables the Raspberry Pi thermal driver in bcm2835_defconfig

* tag 'arm-soc/for-4.10/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: bcm2835: add thermal driver to default config
  ARM: multi_v7_defconfig: Enable BCM47xx/BCM5301x drivers
This commit is contained in:
Arnd Bergmann 2016-11-30 22:21:51 +01:00
commit b32c9b89ad
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/configs/bcm2835_defconfig
View File

@ -73,6 +73,8 @@ CONFIG_SPI_BCM2835=y
CONFIG_SPI_BCM2835AUX=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HWMON is not set
CONFIG_THERMAL=y
CONFIG_BCM2835_THERMAL=y
CONFIG_WATCHDOG=y
CONFIG_BCM2835_WDT=y
CONFIG_DRM=y

13
arch/arm/configs/multi_v7_defconfig
View File

@ -173,6 +173,11 @@ CONFIG_CAN_RCAR=m
CONFIG_CAN_XILINXCAN=y
CONFIG_CAN_MCP251X=y
CONFIG_NET_DSA_BCM_SF2=m
CONFIG_B53=m
CONFIG_B53_SPI_DRIVER=m
CONFIG_B53_MDIO_DRIVER=m
CONFIG_B53_MMAP_DRIVER=m
CONFIG_B53_SRAB_DRIVER=m
CONFIG_CAN_SUN4I=y
CONFIG_BT=m
CONFIG_BT_MRVL=m
@ -235,6 +240,7 @@ CONFIG_HIX5HD2_GMAC=y
CONFIG_SUN4I_EMAC=y
CONFIG_MACB=y
CONFIG_BCMGENET=m
CONFIG_BGMAC_BCMA=y
CONFIG_SYSTEMPORT=m
CONFIG_NET_CALXEDA_XGMAC=y
CONFIG_GIANFAR=y
@ -466,6 +472,7 @@ CONFIG_MESON_WATCHDOG=y
CONFIG_DW_WATCHDOG=y
CONFIG_DIGICOLOR_WATCHDOG=y
CONFIG_BCM2835_WDT=y
CONFIG_BCM47XX_WATCHDOG=y
CONFIG_BCM7038_WDT=m
CONFIG_BCM_KONA_WDT=y
CONFIG_MFD_ACT8945A=y
@ -799,6 +806,10 @@ CONFIG_KEYBOARD_NVEC=y
CONFIG_SERIO_NVEC_PS2=y
CONFIG_NVEC_POWER=y
CONFIG_NVEC_PAZ00=y
CONFIG_BCMA=y
CONFIG_BCMA_HOST_SOC=y
CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_BCMA_DRIVER_GPIO=y
CONFIG_QCOM_GSBI=y
CONFIG_QCOM_PM=y
CONFIG_QCOM_SMEM=y
@ -875,6 +886,8 @@ CONFIG_BCM2835_MBOX=y
CONFIG_RASPBERRYPI_FIRMWARE=y
CONFIG_EFI_VARS=m
CONFIG_EFI_CAPSULE_LOADER=m
CONFIG_CONFIG_BCM47XX_NVRAM=y
CONFIG_BCM47XX_SPROM=y
CONFIG_EXT4_FS=y
CONFIG_AUTOFS4_FS=y
CONFIG_MSDOS_FS=y