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

Commit d44025f0 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

- Stefan provides a set of updates targeting the Raspberry Pi 3 B+
  platform: LAN7515 USB Ethernet driver, Cypress CYW43455 Bluetooth and
  he also enables the VCHIQ driver to help with continous testing on
  kernelci.org.

* tag 'arm-soc/for-4.18/defconfig' of https://github.com/Broadcom/stblinux

:
  ARM: multi_v7_defconfig: Enable LAN and BT for RPi 3 B+
  ARM: bcm2835_defconfig: Enable VCHIQ driver
  ARM: bcm2835_defconfig: Enable LAN78XX driver

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0485c70e f8928381

arch/arm/configs/bcm2835_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_NETDEVICES=y

CONFIG_USB_LAN78XX=y

CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC95XX=y

CONFIG_BRCMFMAC=m
@@ -127,6 +128,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=y 
CONFIG_DMADEVICES=y

CONFIG_DMA_BCM2835=y

CONFIG_STAGING=y

CONFIG_BCM2835_VCHIQ=m

CONFIG_MAILBOX=y

CONFIG_BCM2835_MBOX=y

# CONFIG_IOMMU_SUPPORT is not set

arch/arm/configs/multi_v7_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ CONFIG_B53_MMAP_DRIVER=m 
CONFIG_B53_SRAB_DRIVER=m

CONFIG_CAN_SUN4I=y

CONFIG_BT=m

CONFIG_BT_HCIUART=m

CONFIG_BT_HCIUART_BCM=y

CONFIG_BT_MRVL=m

CONFIG_BT_MRVL_SDIO=m

CONFIG_CFG80211=m
@@ -280,6 +282,7 @@ CONFIG_FIXED_PHY=y 
CONFIG_ROCKCHIP_PHY=y

CONFIG_USB_PEGASUS=y

CONFIG_USB_RTL8152=m

CONFIG_USB_LAN78XX=m

CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC75XX=y

CONFIG_USB_NET_SMSC95XX=y
@@ -360,6 +363,7 @@ CONFIG_SERIAL_ST_ASC=y 
CONFIG_SERIAL_ST_ASC_CONSOLE=y

CONFIG_SERIAL_STM32=y

CONFIG_SERIAL_STM32_CONSOLE=y

CONFIG_SERIAL_DEV_BUS=y

CONFIG_HVC_DRIVER=y

CONFIG_VIRTIO_CONSOLE=y

CONFIG_I2C_CHARDEV=y