Skip to content
Commit 856dfb0c authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

- Florian enables support for the BCM63xx DSL SoCs basic peripherals, enables
  the networking subsystems for Set Top Box SoCs, enables the PWM, watchdog and
  the AHCI controller and SATA PHY drivers

- Florian removes the bcm_defconfig file which is no longer useful and updates
  multi_v7_defconfig to include the Kona watchdog to provide proper reboot for the
  Broadcom Kona platforms

Please note that Tejun Heo has queued a patch which renames AHCI_BRCMSTB into
AHCI_BRCM, to avoid two patches in a row, we just enable AHCI_BRCM to be future
proof

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

:
  ARM: Remove bcm_defconfig
  ARM: multi_v7_defconfig: Enable Broadcom Kona watchdog
  ARM: multi_v7_defconfig: Enable Broadcom STB PWM
  ARM: multi_v7_defconfig: Enable BCM7038 Watchdog
  ARM: multi_v7_defconfig: Enable Broadcom AHCI
  ARM: multi_v7_defconfig: Enable BRCMSTB networking
  ARM: multi_v7_defconfig: Enable BCM63xx

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f52ce16b 41463c3e
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment