Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-30 06:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

This pull request contains Broadcom ARM-based SoCs defconfig changes for

Browse Source 
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.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJa9crtAAoJEIfQlpxEBwcEMsYP/3a2D9QFd00TvZKO4I4SRaBp
 mi7HmKDxp+JZkW6eYQT4vn4L+xyK3pG49hGS80FIhonGs6mGTk+hyw6b/fEhPKnW
 mOkqufOsINhEbhwI/aVpKGFTokVrWyPHvZDYM0E6kwAs1YFxMlv/xnnydlyUyRfO
 a30H4+dnPUVgcCkF8kQj0//pNxgd1ht7guzG8f7QqcmYy2pqQk+G61t3mC2z3Ok9
 cE4ycUFG+D8gAUt3eXpF575ENIPGm6TWJeQ06iUSjlclOjkzke9zrr0CIZDGJHsO
 jnTS8LXWiRLP+r1/iRvy+ED6aFhBZ05Fz9RLo8OS5JusVBN2jsYsLtSZ1TpLeOHY
 HTmEj3cDlfhNpAajRD6M5pZzihUJEKKDFT/SpE9OebMq/Nt0MP4jjN5GSICDLoXy
 d33vPrwu0UMvhFYaDCWhfKFTwZLgMUi4vbh67aoZgh59rIQBeEpOqXqQG0FTwDDX
 Z6KHAY1Q3WaiX8k/lBlOvhzkP8wpTk4fa9ts+4ojYsPF46aruTT6YjVas+xM670r
 Mye3QJj1ljjQjXMogRdgOvlwI3AHpz4ovjecCdc83mIHkhodFsruMdKdxsVRftt1
 FA7jFANDvNtWeeqt9Gjc63qt1hGjWcbXEIYkZ0Iod2him36JGTPycrj4oaNzdC33
 V0mSI+4v62EDSsCNM0Sn
 =IODO
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-05-14 13:19:24 -07:00
commit d44025f050
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/configs/bcm2835_defconfig
View File

@ -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

4
arch/arm/configs/multi_v7_defconfig
View File

@ -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