summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOctavian Purdila <octavian.purdila@nxp.com>2017-03-13 11:40:01 +0200
committerLeonard Crestez <leonard.crestez@nxp.com>2018-08-24 12:41:33 +0300
commit986bfb56bcf8e6c0f41447d819da6147e7cf8b08 (patch)
tree0eb8103fc73b50e06405b764398d238afdbafe85 /arch/arm/configs
parent489f309654ae904b9a4965d7d5aebee168a08a52 (diff)
Revert "MLK-13795 ARM: disable CPU_SW_DOMAIN_PAN"
This reverts commit 9820aee9fb81 ("MLK-13795 ARM: disable CPU_SW_DOMAIN_PAN") because the root cause issue has been fixed in commit 21affa46f845 ("MGS-2721: gpu: integrate 6.2.2 early release driver"). Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/imx_v7_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index 7397a28aa24f..b3f1aa064bf3 100644
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -35,7 +35,6 @@ CONFIG_VMSPLIT_2G=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
-# CONFIG_CPU_SW_DOMAIN_PAN is not set
CONFIG_CMA=y
CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
CONFIG_CPU_FREQ=y