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

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

Merge "defconfig: automatic update"

parents 23926c18 a40c621d

arch/arm/configs/apq8084-perf_defconfig

+4 −4
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ CONFIG_MSM_L2_ERP_2BIT_PANIC=y 
CONFIG_MSM_HSIC_SYSMON=y

CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_MSM_XPU_ERR_FATAL=y

CONFIG_STRICT_MEMORY_RWX=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y
@@ -246,8 +245,8 @@ CONFIG_SATA_AHCI_MSM=y 
CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_VERITY=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_TUN=y
@@ -539,6 +538,8 @@ CONFIG_IOMMU_LPAE=y 
CONFIG_MSM_IOMMU_VBIF_CHECK=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_MOBICORE_SUPPORT=m

CONFIG_MOBICORE_API=m

CONFIG_SENSORS_SSC=y

CONFIG_PHY_MSM_SATA=y

CONFIG_MSM_EVENT_TIMER=y
@@ -561,6 +562,7 @@ CONFIG_MSM_SYSMON_COMM=y 
CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_OCMEM=y

CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_XPU_ERR_FATAL=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y
@@ -603,5 +605,3 @@ CONFIG_CRYPTO_TWOFISH=y 
CONFIG_CRYPTO_DEV_QCRYPTO=m

CONFIG_CRYPTO_DEV_QCE=y

CONFIG_CRYPTO_DEV_QCEDEV=y
 
CONFIG_MOBICORE_SUPPORT=m

CONFIG_MOBICORE_API=m

arch/arm/configs/apq8084_defconfig

+4 −4
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ CONFIG_MSM_CACHE_DUMP_ON_PANIC=y 
CONFIG_MSM_HSIC_SYSMON=y

CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_MSM_XPU_ERR_FATAL=y

CONFIG_STRICT_MEMORY_RWX=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y
@@ -249,8 +248,8 @@ CONFIG_MD=y 
CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_REQ_CRYPT=y

CONFIG_DM_VERITY=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_TUN=y
@@ -543,6 +542,8 @@ CONFIG_IOMMU_LPAE=y 
CONFIG_MSM_IOMMU_VBIF_CHECK=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_MOBICORE_SUPPORT=m

CONFIG_MOBICORE_API=m

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_FUSE=y
@@ -578,6 +579,7 @@ CONFIG_MSM_PIL_SSR_GENERIC=y 
CONFIG_MSM_OCMEM=y

CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_OCMEM_DEBUG=y

CONFIG_MSM_XPU_ERR_FATAL=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y
@@ -645,5 +647,3 @@ CONFIG_CRYPTO_TWOFISH=y 
CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCE=y

CONFIG_CRYPTO_DEV_QCEDEV=y
 
CONFIG_MOBICORE_SUPPORT=m

CONFIG_MOBICORE_API=m

arch/arm/configs/mdm9630_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ CONFIG_CPU_HAS_L2_PMU=y 
CONFIG_MSM_PCIE=y

CONFIG_MSM_UARTDM_Core_v14=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_MSM_XPU_ERR_FATAL=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y

CONFIG_PREEMPT=y
@@ -325,6 +324,7 @@ CONFIG_MSM_SYSMON_COMM=y 
CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_MSM_XPU_ERR_FATAL=y

CONFIG_EXT3_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

arch/arm/configs/msm8226_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ CONFIG_MSM_BUSPM_DEV=m 
CONFIG_MSM_DIRECT_SCLK_ACCESS=y

CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_MSM_XPU_ERR_FATAL=y

CONFIG_STRICT_MEMORY_RWX=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y
@@ -432,6 +431,7 @@ CONFIG_MSM_OCMEM=y 
CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_OCMEM_DEBUG=y

CONFIG_MSM_OCMEM_POWER_DISABLE=y

CONFIG_MSM_XPU_ERR_FATAL=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

arch/arm/configs/msm8610_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ CONFIG_MSM_BUSPM_DEV=m 
CONFIG_MSM_DIRECT_SCLK_ACCESS=y

CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_MSM_XPU_ERR_FATAL=y

CONFIG_STRICT_MEMORY_RWX=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y
@@ -403,6 +402,7 @@ CONFIG_MSM_SUBSYSTEM_RESTART=y 
CONFIG_MSM_SYSMON_COMM=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_MSM_XPU_ERR_FATAL=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y