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

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

Merge "defconfigs: Sync up defconfigs"

parents de0bc8ca e18d923a

arch/arm/configs/sdm660-perf_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ CONFIG_AUDIT=y 
CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IRQ_TIME_ACCOUNTING=y

CONFIG_TASKSTATS=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_RCU_EXPERT=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y
@@ -242,7 +245,7 @@ CONFIG_BLK_DEV_RAM=y 
CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_QSEECOM=y

CONFIG_HDCP_QSEECOM=y

CONFIG_UID_CPUTIME=y

CONFIG_UID_SYS_STATS=y

CONFIG_QPNP_MISC=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y
@@ -527,7 +530,6 @@ CONFIG_MSM_MMCC_660=y 
CONFIG_CLOCK_CPU_OSM=y

CONFIG_QCOM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

CONFIG_ARM_SMMU=y

CONFIG_IOMMU_DEBUG=y

CONFIG_IOMMU_DEBUG_TRACKING=y

arch/arm/configs/sdm660_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -529,8 +529,6 @@ CONFIG_MSM_MMCC_660=y 
CONFIG_CLOCK_CPU_OSM=y

CONFIG_QCOM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

CONFIG_IOMMU_IO_PGTABLE_FAST_SELFTEST=y

CONFIG_ARM_SMMU=y

CONFIG_IOMMU_DEBUG=y

CONFIG_IOMMU_DEBUG_TRACKING=y

arch/arm64/configs/msm-auto-perf_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ CONFIG_AUDIT=y 
CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IRQ_TIME_ACCOUNTING=y

CONFIG_TASKSTATS=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_RCU_EXPERT=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y
@@ -242,7 +245,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 
CONFIG_QSEECOM=y

CONFIG_HDCP_QSEECOM=y

CONFIG_PROFILER=y

CONFIG_UID_CPUTIME=y

CONFIG_UID_SYS_STATS=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

arch/arm64/configs/msm-auto_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ CONFIG_AUDIT=y 
CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IRQ_TIME_ACCOUNTING=y

CONFIG_TASKSTATS=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_RCU_EXPERT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -234,7 +237,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 
CONFIG_QSEECOM=y

CONFIG_HDCP_QSEECOM=y

CONFIG_PROFILER=y

CONFIG_UID_CPUTIME=y

CONFIG_UID_SYS_STATS=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

arch/arm64/configs/msmcortex_mediabox_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ CONFIG_AUDIT=y 
CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IRQ_TIME_ACCOUNTING=y

CONFIG_TASKSTATS=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_RCU_EXPERT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -242,7 +245,7 @@ CONFIG_BLK_DEV_RAM=y 
CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_QSEECOM=y

CONFIG_HDCP_QSEECOM=y

CONFIG_UID_CPUTIME=y

CONFIG_UID_SYS_STATS=y

CONFIG_QPNP_MISC=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y