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

Unverified Commit f880c8fd authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-defconfig-next-2017-03-21' into defconfig/next 



This pull request fixes graphics in bcm2835_defconfig by enabling CMA,
and starts building the new SDHOST MMC driver on multi_v7_defconfig,
so that we can switch to it by default in the following release.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents c1ae3cfa 51a08de0

arch/arm/configs/bcm2835_defconfig

+3 −2
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_FHANDLE=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BSD_PROCESS_ACCT=y
@@ -32,6 +31,7 @@ CONFIG_PREEMPT_VOLUNTARY=y 
CONFIG_AEABI=y

CONFIG_KSM=y

CONFIG_CLEANCACHE=y

CONFIG_CMA=y

CONFIG_SECCOMP=y

CONFIG_KEXEC=y

CONFIG_CRASH_DUMP=y
@@ -52,6 +52,7 @@ CONFIG_MAC80211=y 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

CONFIG_DMA_CMA=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_CONSTANTS=y
@@ -62,7 +63,6 @@ CONFIG_USB_NET_SMSC95XX=y 
CONFIG_ZD1211RW=y

CONFIG_INPUT_EVDEV=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_TTY_PRINTK=y
@@ -92,6 +92,7 @@ CONFIG_MMC=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_IPROC=y

CONFIG_MMC_BCM2835=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -730,6 +730,7 @@ CONFIG_MMC_DW_EXYNOS=y 
CONFIG_MMC_DW_ROCKCHIP=y

CONFIG_MMC_SH_MMCIF=y

CONFIG_MMC_SUNXI=y

CONFIG_MMC_BCM2835=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS_FLASH=m