summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/imx_v6_v7_defconfig
diff options
context:
space:
mode:
authorPeng Fan2018-01-05 10:40:35 +0100
committerShawn Guo2018-02-12 06:07:22 +0100
commit83bd0aaa3b9d1d1bd72d0687ef6716c25f23305b (patch)
tree70540ed04dae0c27ed0b4cf4a1f4e5bdd968b74e /arch/arm/configs/imx_v6_v7_defconfig
parentARM: imx_v6_v7_defconfig: select the CONFIG_CPUFREQ_DT (diff)
downloadkernel-qcow2-linux-83bd0aaa3b9d1d1bd72d0687ef6716c25f23305b.tar.gz
kernel-qcow2-linux-83bd0aaa3b9d1d1bd72d0687ef6716c25f23305b.tar.xz
kernel-qcow2-linux-83bd0aaa3b9d1d1bd72d0687ef6716c25f23305b.zip
ARM: imx_v6_v7_defconfig: enable OP-TEE
This patch enables configs for Trusted Execution Environment(TEE) and Open Portable Trusted Execution Environment(OP-TEE). With Linux running in Trustzone non-secure world, OP-TEE OS runs in secure world, linux could use secure services provided by OP-TEE. With TEE/OP-TEE options selected, use the bindings in Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.txt to let the driver probe work. On i.MX6/7, now the bootflow is U-Boot->OP-TEE->Linux, OP-TEE will automatically create that node. Signed-off-by: Peng Fan <peng.fan@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/configs/imx_v6_v7_defconfig')
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 0b9551f51985..9363cec24fa7 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -375,6 +375,8 @@ CONFIG_PWM=y
CONFIG_PWM_FSL_FTM=y
CONFIG_PWM_IMX=y
CONFIG_NVMEM_IMX_OCOTP=y
+CONFIG_TEE=y
+CONFIG_OPTEE=y
CONFIG_MUX_MMIO=y
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y