diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 22:28:21 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 22:28:21 +0200 |
| commit | 6fdb351dfa5c4509213db6df6584439289624669 (patch) | |
| tree | 7967fb8beb293f5d6915801127ff7e58f8556440 /arch/arm/configs | |
| parent | 9bdc9a9bc694dd4d5ca97cab7f7adcda893b10d2 (diff) | |
| parent | 8f457cb291342d9ac04dbb8dc565619d220841f8 (diff) | |
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
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 7 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index 3ee9d78c412a..43dab4890ad3 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -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 diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 6cfd6137db88..906d60e48f0f 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -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 |