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

Commit 88a7f04b 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 269933ae 77a0c404

arch/arm/configs/apq8084-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ CONFIG_MSM_L2_ERP_PORT_PANIC=y 
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_STRICT_MEMORY_RWX=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y
@@ -563,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_BOOT_STATS=y

CONFIG_MSM_XPU_ERR_FATAL=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT2_FS=y

arch/arm/configs/apq8084_defconfig

+3 −3
Original line number Diff line number Diff line
@@ -49,11 +49,8 @@ CONFIG_MSM_L1_ERR_LOG=y 
CONFIG_MSM_L2_ERP_PRINT_ACCESS_ERRORS=y

CONFIG_MSM_L2_ERP_PORT_PANIC=y

CONFIG_MSM_L2_ERP_2BIT_PANIC=y

CONFIG_MSM_CACHE_DUMP=y

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_STRICT_MEMORY_RWX=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y
@@ -580,7 +577,10 @@ CONFIG_MSM_PIL_SSR_GENERIC=y 
CONFIG_MSM_OCMEM=y

CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_OCMEM_DEBUG=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_MSM_XPU_ERR_FATAL=y

CONFIG_MSM_CACHE_DUMP=y

CONFIG_MSM_CACHE_DUMP_ON_PANIC=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

arch/arm/configs/fsm9900_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ CONFIG_MSM_L2_ERP_PRINT_ACCESS_ERRORS=y 
CONFIG_MSM_L2_ERP_PORT_PANIC=y

CONFIG_MSM_L2_ERP_1BIT_PANIC=y

CONFIG_MSM_L2_ERP_2BIT_PANIC=y

CONFIG_MSM_CACHE_DUMP=y

CONFIG_MSM_CACHE_DUMP_ON_PANIC=y

CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y

CONFIG_MSM_PP2S_FEMTO=y

CONFIG_STRICT_MEMORY_RWX=y
@@ -281,6 +279,8 @@ CONFIG_MSM_OCMEM=y 
CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_OCMEM_DEBUG=y

CONFIG_MSM_OCMEM_NONSECURE=y

CONFIG_MSM_CACHE_DUMP=y

CONFIG_MSM_CACHE_DUMP_ON_PANIC=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT3_FS=y

arch/arm/configs/mdm9630-perf_defconfig

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

CONFIG_MSM_PCIE=y

CONFIG_MSM_UARTDM_Core_v14=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y

CONFIG_PREEMPT=y
@@ -311,6 +310,7 @@ CONFIG_MSM_SYSMON_COMM=y 
CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_EXT3_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

arch/arm/configs/mdm9630_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ CONFIG_ARCH_MDM9630=y 
CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_PCIE=y

CONFIG_MSM_UARTDM_Core_v14=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y

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

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_MSM_XPU_ERR_FATAL=y

CONFIG_EXT3_FS=y

CONFIG_VFAT_FS=y