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

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

Merge "defconfig: msm: Enable mpu based kernel text protection"

parents 642b2c37 b2bda033

arch/arm/configs/msm8937-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -551,6 +551,8 @@ CONFIG_MSM_CORE_CTL_HELPER=y 
CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_PERFORMANCE=y

# CONFIG_MSM_PERFORMANCE_HOTPLUG_ON is not set

CONFIG_MSM_KERNEL_PROTECT=y

CONFIG_MSM_KERNEL_PROTECT_MPU=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_MSM_CLK_CONTROLLER_V2=y

CONFIG_MSM_MDSS_PLL=y

arch/arm/configs/msm8937_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -560,6 +560,8 @@ CONFIG_MSM_CORE_CTL_HELPER=y 
CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_PERFORMANCE=y

# CONFIG_MSM_PERFORMANCE_HOTPLUG_ON is not set

CONFIG_MSM_KERNEL_PROTECT=y

CONFIG_MSM_KERNEL_PROTECT_MPU=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_MSM_CLK_CONTROLLER_V2=y

CONFIG_MSM_MDSS_PLL=y

arch/arm/configs/msmcortex-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -543,6 +543,8 @@ CONFIG_MSM_PIL_MSS_QDSP6V5=y 
CONFIG_MSM_CORE_CTL_HELPER=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_KERNEL_PROTECT=y

CONFIG_MSM_KERNEL_PROTECT_MPU=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_MSM_CLK_CONTROLLER_V2=y

CONFIG_MSM_MDSS_PLL=y

arch/arm/configs/msmcortex_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -547,6 +547,8 @@ CONFIG_MSM_PIL_MSS_QDSP6V5=y 
CONFIG_MSM_CORE_CTL_HELPER=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_KERNEL_PROTECT=y

CONFIG_MSM_KERNEL_PROTECT_MPU=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_MSM_CLK_CONTROLLER_V2=y

CONFIG_MSM_MDSS_PLL=y

arch/arm64/configs/msm8937-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -555,6 +555,8 @@ CONFIG_MSM_CORE_CTL_HELPER=y 
CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_PERFORMANCE=y

# CONFIG_MSM_PERFORMANCE_HOTPLUG_ON is not set

CONFIG_MSM_KERNEL_PROTECT=y

CONFIG_MSM_KERNEL_PROTECT_MPU=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_MSM_CLK_CONTROLLER_V2=y

CONFIG_MSM_MDSS_PLL=y