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

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

Merge "defconfig: arm64: msm: Enable Security configurations"

parents da99eb5f b9bc650f

arch/arm64/configs/msm-auto-perf_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ CONFIG_EMBEDDED=y 
# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_CC_STACKPROTECTOR_REGULAR=y

CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_ARCH_MMAP_RND_COMPAT_BITS=16

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -69,6 +69,7 @@ CONFIG_ARMV8_DEPRECATED=y 
CONFIG_SWP_EMULATION=y

CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

CONFIG_ARM64_PAN=y

# CONFIG_EFI is not set

CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

arch/arm64/configs/msm-auto_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ CONFIG_KALLSYMS_ALL=y 
CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_CC_STACKPROTECTOR_REGULAR=y

CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_ARCH_MMAP_RND_COMPAT_BITS=16

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -67,6 +67,7 @@ CONFIG_ARMV8_DEPRECATED=y 
CONFIG_SWP_EMULATION=y

CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

CONFIG_ARM64_PAN=y

CONFIG_CMDLINE="console=ttyAMA0"

# CONFIG_EFI is not set

CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y