github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 12:35:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

This pull request brings in changes for bcm2835_defconfig and

Browse Source 
multi_v7_defconfig in 4.7.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCgAGBQJXF7IeAAoJELXWKTbR/J7oSNIP/2xB1yLvz1kQ57SRlYbx7U5b
 ZLpNLpxDOsZR+df8mCTw/7BAMPcJsEcyl3QfttOeL+LMZ9haokN1D9AXBuns+HfX
 +9Vd3REofBbzl18WrrU2pY9kbwQKK5qdRkKjbNCS8i4PrKV+ddkfHRPXUjg2FyGB
 v3ix2nOLIvRHqL+N6EqicVJX2oLGZVfkv3SzCFF1NOu0hg/8ZprtPPnwDhiciFuA
 oDmG6QwMHom2GMczPc/rHwUI0vXPQcugR1mhaBpxpmXdhilwDDKqb8W0Ud5kdlF8
 82UKakhZC1Z2UJ+o9dZ4SswYvJDj3G4Qs0Kk+Monyps4NGGj0OPuuPhObfQ+qyMN
 MMvBm5eu3ptJensFMgudWy/r1WVAFNAi4CPgSa/4q1zh8ePliC/bFOrWkSo/b1QC
 0xlCv6XrZ4mgnNsIKb10tGDVTZEB6pGErgS0oqBXslw91QKuZmdVak9bzGOvMLri
 OhHODU0ycKo4I+lwJVATnUVh5GWRuIbR7+qg6RF+AigN/g+GhbavKVPlEglLY1/c
 Je9/N6YNtoinBIa09MVfPcsXuu9lhO+F4BlwF5Bc7EPGa7iKfkxAlqrmoT9qMmyB
 1AcRLVbe/C28K6JrzCRirkADnjvz9M8KfA0C5xbsxRRMuY65BWKmU6l1ChDlP3VS
 SvWPnv+qFmRY4xMkmw2j
 =OSk6
 -----END PGP SIGNATURE-----

Merge tag 'bcm2835-defconfig-next-2016-04-20' into defconfig/next

This pull request brings in changes for bcm2835_defconfig and
multi_v7_defconfig in 4.7.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli 2016-04-22 12:25:34 -07:00
commit b72541b338
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

@ -438,6 +438,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
@ -564,6 +565,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
@ -609,7 +611,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
@ -640,7 +642,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