Commit 96609676 authored May 14, 2018 by Olof Johansson

Merge tag 'arm-soc/for-4.18/defconfig-arm64' of...

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

This pull request contains Broadcom ARM64-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 when
  using the Pi 3 B+ in AArch64 boot mode. He also updates the ARM64
  defconfig to create a bigger default CMA region to let the VideoCore 4
  driver initialize correctly.

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

:
  arm64: defconfig: Increase CMA size for VC4
  arm64: defconfig: Enable LAN and BT support for RPi 3 B+

Signed-off-by: Olof Johansson <olof@lixom.net>

parents d44025f0 ebf08924

arch/arm64/configs/defconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,7 @@ CONFIG_BT_LEDS=y
		# CONFIG_BT_DEBUGFS is not set
		CONFIG_BT_HCIUART=m
		CONFIG_BT_HCIUART_LL=y
		CONFIG_BT_HCIUART_BCM=y
		CONFIG_CFG80211=m
		CONFIG_MAC80211=m
		CONFIG_MAC80211_LEDS=y
		@@ -169,6 +170,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
		CONFIG_DEVTMPFS=y
		CONFIG_DEVTMPFS_MOUNT=y
		CONFIG_DMA_CMA=y
		CONFIG_CMA_SIZE_MBYTES=32
		CONFIG_MTD=y
		CONFIG_MTD_BLOCK=y
		CONFIG_MTD_M25P80=y
		@@ -239,6 +241,7 @@ CONFIG_ROCKCHIP_PHY=y
		CONFIG_USB_PEGASUS=m
		CONFIG_USB_RTL8150=m
		CONFIG_USB_RTL8152=m
		CONFIG_USB_LAN78XX=m
		CONFIG_USB_USBNET=m
		CONFIG_USB_NET_DM9601=m
		CONFIG_USB_NET_SR9800=m