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

Commit c59fc610 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: arm: msm: add mdss configurations"

parents 86478b92 60d97ac2

arch/arm/configs/msm8937-perf_defconfig

+3 −4
Original line number Diff line number Diff line
@@ -354,9 +354,9 @@ CONFIG_SOC_CAMERA_PLATFORM=y 
CONFIG_RADIO_SILABS=y

CONFIG_MSM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

CONFIG_FB_MSM=y

CONFIG_FB_MSM_MDP_NONE=y

CONFIG_FB_MSM_MDSS=y

CONFIG_FB_MSM_MDSS_WRITEBACK=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_SOUND=y

CONFIG_SND=y
@@ -429,8 +429,6 @@ CONFIG_ANDROID_BINDER_IPC=y 
CONFIG_ASHMEM=y

CONFIG_ANDROID_TIMED_GPIO=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_SYNC=y

CONFIG_SW_SYNC=y

CONFIG_SW_SYNC_USER=y

CONFIG_ION=y

CONFIG_ION_MSM=y
@@ -488,6 +486,7 @@ CONFIG_MSM_CORE_CTL_HELPER=y 
CONFIG_MSM_BAM_DMUX=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_MSM_CLK_CONTROLLER_V2=y

CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_IOMMU_V1=y

CONFIG_ARM_SMMU=y

arch/arm/configs/msm8937_defconfig

+3 −4
Original line number Diff line number Diff line
@@ -345,9 +345,9 @@ CONFIG_SOC_CAMERA_PLATFORM=y 
CONFIG_RADIO_SILABS=y

CONFIG_MSM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

CONFIG_FB_MSM=y

CONFIG_FB_MSM_MDP_NONE=y

CONFIG_FB_MSM_MDSS=y

CONFIG_FB_MSM_MDSS_WRITEBACK=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

# CONFIG_LCD_CLASS_DEVICE is not set

CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -425,8 +425,6 @@ CONFIG_ANDROID_BINDER_IPC=y 
CONFIG_ASHMEM=y

CONFIG_ANDROID_TIMED_GPIO=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_SYNC=y

CONFIG_SW_SYNC=y

CONFIG_SW_SYNC_USER=y

CONFIG_ION=y

CONFIG_ION_MSM=y
@@ -489,6 +487,7 @@ CONFIG_MSM_PERFORMANCE=y 
# CONFIG_MSM_PERFORMANCE_HOTPLUG_ON is not set

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_MSM_CLK_CONTROLLER_V2=y

CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_IOMMU_V1=y

CONFIG_ARM_SMMU=y