leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- Eric enables more BCM2835 peripherals in multi_v7_defconfig: watchdog, I2S,
   switches from the sdhci-bcm2835 to the sdhci-iproc driver, DWC2 USB controller
 
 - Eric also enables more BCM2835 peripherals in bcm2835_defconfig: VC4, NFS root
   Power Management support, switching sdhci-bcm2835 for sdhci-iproc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXG8pNAAoJEIfQlpxEBwcEipUQAMqVGtqqdxEEGa0nwGGabpms
 oxKUkAPgflzYWoPy28WoCoaRGceNz+aP1H204nqJqXhHbUKeJaTPTu6TwMMMx2K5
 vBsGQan7flOuPEaGEsRTb5bxG6DoTxa9FdfMFmekUWwEaxvmTwvjqyh62P9AwNOH
 IKKdHOCIqJmMOcvzr8Ptr2Z2+2wOojzteyo7U5WZ0oqg/+UIKRnnQqX/k+OE8swj
 iX7u48fhtymPk/wDCks51IsV9PdJLIITqg73Dtxp7ltY1tvPDMUdsZyWOxo3A8b7
 B8251VD/njgITbFOZUDn7X0QdH0NPwuZzIcp3Mdcz/ZPy++uJbotKSHOKFsnZXuU
 f5DfR8UleJ8IadOUpLVDG3mr5tX7UyxogN35cmA9X394T9qKgaq9626namcGWS/1
 LfSD+Tg/AQQUA4sK8rhk7qXSTO0VLKTP314l/TyV2L5qMeZPsoabAllYhC5/XcXI
 2nwsqbUxvyUAt2asiVtPOA5sFHCkyT7Cq55mxYbqOEdqteSJm2iqWRLBh90C2F6X
 c0JpdFZs9Ag5LOjRr9k6cDb9XhWdhdIk9Xpq1KPVsQBq7F8giNgIq21nsup8FYr4
 eokJHLnM6lfGzaNOnlg6sCE6Aqt9g63OFCvTIR9ylJTWvptK+ZwWqQdL9Sp0IjvI
 A5D+RGyAqRc6zWDECeKq
 =QxkI
 -----END PGP SIGNATURE-----

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

Merge "This pull request contains defconfig changes for Broadcom ARM-based SoCs"
from Florian Fainelli:

- Eric enables more BCM2835 peripherals in multi_v7_defconfig: watchdog, I2S,
  switches from the sdhci-bcm2835 to the sdhci-iproc driver, DWC2 USB controller

- Eric also enables more BCM2835 peripherals in bcm2835_defconfig: VC4, NFS root
  Power Management support, switching sdhci-bcm2835 for sdhci-iproc

* tag 'arm-soc/for-4.7/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: bcm2835: Enable NFS root support.
  ARM: bcm2835: Enable the VC4 graphics driver in the defconfig
  ARM: bcm2835: Enable CONFIG_PM.
  ARM: bcm2835: Switch BCM2835 to sdhci-iproc.c for MMC
  ARM: multi_v7_defconfig: Build in DWC2 USB support
  ARM: multi_v7_defconfig: Switch BCM2835 to sdhci-iproc.c for MMC
  ARM: multi_v7_defconfig: Add more BCM2835 support
This commit is contained in:
Arnd Bergmann 2016-04-25 21:11:13 +02:00
commit ccb0f688ea
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/configs/bcm2835_defconfig
View File

@ -38,10 +38,13 @@ CONFIG_CRASH_DUMP=y
CONFIG_VFP=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_SUSPEND is not set
CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
CONFIG_NETWORK_SECMARK=y
CONFIG_NETFILTER=y
CONFIG_CFG80211=y
@ -63,7 +66,6 @@ CONFIG_INPUT_EVDEV=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_TTY_PRINTK=y
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_BCM2835=y
CONFIG_SPI=y
@ -73,10 +75,10 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_HWMON is not set
CONFIG_WATCHDOG=y
CONFIG_BCM2835_WDT=y
CONFIG_FB=y
CONFIG_DRM=y
CONFIG_DRM_VC4=y
CONFIG_FB_SIMPLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_SOUND=y
CONFIG_SND=y
CONFIG_SND_SOC=y
@ -87,7 +89,7 @@ CONFIG_USB_DWC2=y
CONFIG_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_BCM2835=y
CONFIG_MMC_SDHCI_IPROC=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
@ -122,6 +124,7 @@ CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
# CONFIG_MISC_FILESYSTEMS is not set
CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y
CONFIG_NFSD=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ASCII=y

5
arch/arm/configs/multi_v7_defconfig
View File

@ -446,6 +446,7 @@ CONFIG_TEGRA_WATCHDOG=m
CONFIG_MESON_WATCHDOG=y
CONFIG_DW_WATCHDOG=y
CONFIG_DIGICOLOR_WATCHDOG=y
CONFIG_BCM2835_WDT=y
CONFIG_MFD_AS3711=y
CONFIG_MFD_AS3722=y
CONFIG_MFD_ATMEL_FLEXCOM=y
@ -575,6 +576,7 @@ CONFIG_SND_USB_AUDIO=m
CONFIG_SND_SOC=m
CONFIG_SND_ATMEL_SOC=m
CONFIG_SND_ATMEL_SOC_WM8904=m
CONFIG_SND_BCM2835_SOC_I2S=m
CONFIG_SND_SOC_FSL_SAI=m
CONFIG_SND_SOC_ROCKCHIP=m
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
@ -620,7 +622,7 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_MUSB_HDRC=m
CONFIG_USB_MUSB_SUNXI=m
CONFIG_USB_DWC3=y
CONFIG_USB_DWC2=m
CONFIG_USB_DWC2=y
CONFIG_USB_CHIPIDEA=y
CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_CHIPIDEA_HOST=y
@ -651,7 +653,6 @@ CONFIG_MMC_SDHCI_SPEAR=y
CONFIG_MMC_SDHCI_S3C=y
CONFIG_MMC_SDHCI_S3C_DMA=y
CONFIG_MMC_SDHCI_BCM_KONA=y
CONFIG_MMC_SDHCI_BCM2835=y
CONFIG_MMC_SDHCI_ST=y
CONFIG_MMC_OMAP=y
CONFIG_MMC_OMAP_HS=y