diff options
| author | Florian Fainelli <[email protected]> | 2017-08-07 10:46:40 -0700 |
|---|---|---|
| committer | Florian Fainelli <[email protected]> | 2017-08-07 10:46:40 -0700 |
| commit | 5fbc73633f2746ab94555de3ca885a01834a8190 (patch) | |
| tree | f9060ceda20d557202d6430a5f938bd3293ca55d | |
| parent | 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff) | |
| parent | 6235a80a5475d10ebef646c06cf7cf0f4aba688c (diff) | |
Merge tag 'bcm2835-defconfig-next-2017-08-07' into defconfig/next
This pull request brings in defconfig changes for the Raspberry Pi
Zero W.
Signed-off-by: Florian Fainelli <[email protected]>
| -rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 7 |
1 files changed, 7 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 |