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

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

Merge "defconfig: msm: enable CONFIG_MSM_MCU_TIME_SYNC"

parents b9be0741 9a041b61

arch/arm/configs/msm8909-perf_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ CONFIG_ZRAM=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_QSEECOM=y

CONFIG_MSM_MCU_TIME_SYNC=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y
@@ -424,6 +425,9 @@ CONFIG_QPNP_VIBRATOR=y 
CONFIG_MSM_SPMI=y

CONFIG_MSM_SPMI_PMIC_ARB=y

CONFIG_MSM_QPNP_INT=y

CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_IOMMU_V1=y

CONFIG_MSM_ADSP_LOADER=y

CONFIG_MSM_MEMORY_DUMP_V2=y

CONFIG_MSM_BOOT_STATS=y
@@ -453,9 +457,6 @@ CONFIG_MSM_PERFORMANCE=y 
# CONFIG_MSM_PERFORMANCE_HOTPLUG_ON is not set

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_IOMMU_V1=y

CONFIG_SPDM_SCM=y

CONFIG_DEVFREQ_SPDM=y

CONFIG_PWM=y

arch/arm/configs/msm8909_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ CONFIG_ZRAM=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_QSEECOM=y

CONFIG_MSM_MCU_TIME_SYNC=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y
@@ -434,6 +435,9 @@ CONFIG_MSM_SPMI=y 
CONFIG_MSM_SPMI_PMIC_ARB=y

CONFIG_MSM_QPNP_INT=y

# CONFIG_MSM_SPMI_DEBUGFS_RO is not set

CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_IOMMU_V1=y

CONFIG_MSM_ADSP_LOADER=y

CONFIG_MSM_MEMORY_DUMP_V2=y

CONFIG_MSM_BOOT_STATS=y
@@ -463,9 +467,6 @@ CONFIG_MSM_PERFORMANCE=y 
# CONFIG_MSM_PERFORMANCE_HOTPLUG_ON is not set

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_IOMMU_V1=y

CONFIG_SPDM_SCM=y

CONFIG_DEVFREQ_SPDM=y

CONFIG_PWM=y