• Arnd Bergmann's avatar
    Merge tag 'arm-soc/for-4.14/defconfig' of http://github.com/Broadcom/stblinux into next/defconfig · 6fdb351d
    Arnd Bergmann authored
    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
    6fdb351d
multi_v7_defconfig 22 KB