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

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

Merge "defconfig: Align sdm660 arm32 defconfig with arm64"

parents 8f0a76b8 154827ce

arch/arm/configs/sdm660-perf_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ CONFIG_EMBEDDED=y 
# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_CC_STACKPROTECTOR_REGULAR=y

CONFIG_ARCH_MMAP_RND_BITS=16

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y
@@ -234,7 +235,6 @@ CONFIG_IPC_ROUTER=y 
CONFIG_IPC_ROUTER_SECURITY=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=40

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y
@@ -497,6 +497,9 @@ CONFIG_CLOCK_CPU_OSM=y 
CONFIG_QCOM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_ARM_SMMU=y

CONFIG_IOMMU_DEBUG=y

CONFIG_IOMMU_DEBUG_TRACKING=y

CONFIG_IOMMU_TESTS=y

CONFIG_QCOM_COMMON_LOG=y

CONFIG_MSM_SMEM=y

CONFIG_QPNP_HAPTIC=y

arch/arm/configs/sdm660_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ CONFIG_EMBEDDED=y 
# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_CC_STACKPROTECTOR_REGULAR=y

CONFIG_ARCH_MMAP_RND_BITS=16

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y
@@ -232,7 +233,6 @@ CONFIG_IPC_ROUTER=y 
CONFIG_IPC_ROUTER_SECURITY=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=40

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

arch/arm64/configs/sdm660-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ CONFIG_EMBEDDED=y 
# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_CC_STACKPROTECTOR_REGULAR=y

CONFIG_ARCH_MMAP_RND_COMPAT_BITS=16

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

arch/arm64/configs/sdm660_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ CONFIG_EMBEDDED=y 
# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_CC_STACKPROTECTOR_REGULAR=y

CONFIG_ARCH_MMAP_RND_COMPAT_BITS=16

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y