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>

diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 0b9551f51985032d9b7b1e1f47ab401b500cf0a1..9363cec24fa7755c755b2b5c3aba98d5506ce122 100644 (file)
--- 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