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

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

Merge "ARM: defconfig: msm: Resync defconfigs"

parents 069b17a5 e5f4c2b9

arch/arm/configs/apq8053_IoE-perf_defconfig

+5 −5
Original line number Diff line number Diff line
@@ -495,6 +495,11 @@ CONFIG_GPIO_USB_DETECT=y 
CONFIG_MSM_SPMI=y

CONFIG_MSM_SPMI_PMIC_ARB=y

CONFIG_MSM_QPNP_INT=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

CONFIG_MSM_ADSP_LOADER=y

CONFIG_MSM_MEMORY_DUMP_V2=y

CONFIG_MSM_BOOT_STATS=y
@@ -536,11 +541,6 @@ CONFIG_MSM_PERFORMANCE=y 
CONFIG_MSM_KERNEL_PROTECT=y

CONFIG_MSM_KERNEL_PROTECT_MPU=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

CONFIG_SPDM_SCM=y

CONFIG_DEVFREQ_SPDM=y

CONFIG_PWM=y

arch/arm/configs/mdm-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ CONFIG_GPIO_USB_DETECT=y 
CONFIG_MSM_SPMI=y

CONFIG_MSM_SPMI_PMIC_ARB=y

CONFIG_MSM_QPNP_INT=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_ADSP_LOADER=y

CONFIG_MSM_MEMORY_DUMP_V2=y

CONFIG_MSM_BOOT_STATS=y
@@ -377,7 +378,6 @@ CONFIG_MSM_PIL_SSR_GENERIC=y 
CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_TRACER_PKT=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_DEVFREQ_SPDM=y

CONFIG_IIO=y

CONFIG_IIO_ST_ACCEL_3AXIS=y

arch/arm/configs/mdm9607-128mb-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ CONFIG_SPS_SUPPORT_NDP_BAM=y 
CONFIG_MSM_SPMI=y

CONFIG_MSM_SPMI_PMIC_ARB=y

CONFIG_MSM_QPNP_INT=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_MEMORY_DUMP_V2=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_MSM_COMMON_LOG=y
@@ -267,7 +268,6 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_TRACER_PKT=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_FUSE=y

arch/arm/configs/mdm9607-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ CONFIG_GSI=y 
CONFIG_MSM_SPMI=y

CONFIG_MSM_SPMI_PMIC_ARB=y

CONFIG_MSM_QPNP_INT=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_ADSP_LOADER=y

CONFIG_MSM_MEMORY_DUMP_V2=y

CONFIG_MSM_BOOT_STATS=y
@@ -350,7 +351,6 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_TRACER_PKT=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_IIO=y

CONFIG_IIO_BUFFER=y

CONFIG_IIO_BUFFER_CB=y

arch/arm/configs/mdm9607_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ CONFIG_GSI=y 
CONFIG_MSM_SPMI=y

CONFIG_MSM_SPMI_PMIC_ARB=y

CONFIG_MSM_QPNP_INT=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_ADSP_LOADER=y

CONFIG_MSM_MEMORY_DUMP_V2=y

CONFIG_MSM_BOOT_STATS=y
@@ -351,7 +352,6 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_TRACER_PKT=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_IIO=y

CONFIG_IIO_BUFFER=y

CONFIG_IIO_BUFFER_CB=y