Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 5fbc7363 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 5771a8c0 6235a80a

arch/arm/configs/bcm2835_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -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