Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b72541b3 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents f55532a0 3652bb35

arch/arm/configs/bcm2835_defconfig

+7 −4
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/multi_v7_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -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