korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-14 06:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

This pull request contains defconfig file changes for Broadcom ARM-based SoCs

Browse Source 
for 4.14, please pull the following:
 
 - Markus enables the Broadcom STB AVS thermal monitoring driver as a module
   which is currently queued in Rui Zhang's tree
 
 - Stefan updates the bcm2835_defconfig to contain a few useful changes: the RPI
   mini UART is enabled by default, the default CMA pool is bumped up to 32MB to
   support VC4 usages and finally BRCMFMAC is enabled as module since this is the
   wireless driver used on Raspberry Pi Zero Wireless.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJZldaIAAoJEIfQlpxEBwcEaVMP/3MVHki9bl11DJVKmnF/itNa
 lGASCwdP+zHlBOtazBuDXxymrfZtn0xYPv+m5A/dzuMp7NJUeW7xuefk/hxeGLhA
 43VslCu/w6TKduhBykP1u0ktZHTz/esx71/Eb6wxLDzOnCXrhICoe1npp91othlo
 EmvsZx2hinjvNqVxPxcJOb/QLJdJaGkoclRTWNX57N9D1HMNnSTz5+FGzYEHYY86
 ud0DMTxHRZ1KeYQBto9Q6YdKspecSKCxXc2/Ir/k7dQ+ZOp5jSzS7nU7rZ3UsuBY
 SLhEcEwHPq2RXq5vZlRy/QcFwodi6BeWz6Ig18P3mJ2RVzCvx5GlGjpKdLS9WpIo
 jkUNav6k8R5Ygl+eWmcKX66JVSrELj81pEsznikM1ExGcI3EBhhTARHrol3NOmgh
 ZkH3OrFwz2MuKhhE8TJ14uPo5pa/SvECNWNXmgiWJOr0CO/XjhYxWE5lGbVOv1/R
 W8B0A2jrUh7lP7ziFfiREhSHJ2V3Br/q/ORi2N5atTggdVsZLQ4tltoozKcr+FmB
 z9eEAqeVY6kYePVbRkUjsMj/hzJgu3OGmsWBsbTKGkzvHSGLXL0n/A920zLuvyM3
 QEfqJexrTp5nH8JjnjXA/SS3qApeZXKScL3vhfO5wWHyvSaxJwzMj9YrBnpghYPb
 54aPGnolFtzNc8NIQx/e
 =+2/I
 -----END PGP SIGNATURE-----

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

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

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

- Markus enables the Broadcom STB AVS thermal monitoring driver as a module
  which is currently queued in Rui Zhang's tree

- Stefan updates the bcm2835_defconfig to contain a few useful changes: the RPI
  mini UART is enabled by default, the default CMA pool is bumped up to 32MB to
  support VC4 usages and finally BRCMFMAC is enabled as module since this is the
  wireless driver used on Raspberry Pi Zero Wireless.

* tag 'arm-soc/for-4.14/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: multi_v7_defconfig: add CONFIG_BRCMSTB_THERMAL
  ARM: bcm2835_defconfig: Enable wifi driver for RPi Zero W
  ARM: bcm2835_defconfig: Increase CMA for VC4
  ARM: bcm2835_defconfig: Enable Mini UART console support
This commit is contained in:
Arnd Bergmann 2017-08-18 22:28:21 +02:00
commit 6fdb351dfa
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/configs/bcm2835_defconfig
View File

@ -55,6 +55,7 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=32
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_SCSI_CONSTANTS=y
@ -62,9 +63,15 @@ CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_NETDEVICES=y
CONFIG_USB_USBNET=y
CONFIG_USB_NET_SMSC95XX=y
CONFIG_BRCMFMAC=m
CONFIG_ZD1211RW=y
CONFIG_INPUT_EVDEV=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_8250_BCM2835AUX=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_TTY_PRINTK=y

1
arch/arm/configs/multi_v7_defconfig
View File

@ -454,6 +454,7 @@ CONFIG_SENSORS_NTC_THERMISTOR=m
CONFIG_SENSORS_PWM_FAN=m
CONFIG_SENSORS_INA2XX=m
CONFIG_CPU_THERMAL=y
CONFIG_BRCMSTB_THERMAL=m
CONFIG_ROCKCHIP_THERMAL=y
CONFIG_RCAR_THERMAL=y
CONFIG_ARMADA_THERMAL=y