summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorBai Ping <ping.bai@nxp.com>2017-12-04 10:50:33 +0800
committerYe Li <ye.li@nxp.com>2020-04-26 23:24:32 -0700
commit7f8558cdff890e465b959e513f574b8c7509b600 (patch)
tree1600dd946556cc37cf2f3cc0371d5cd4e2686326 /board
parent9b9722822d830367f74fc7ff2ca50979e73a1e52 (diff)
MLK-17082-01 imx: add optee support for imx6sll
Add different defconfig for optee; Enable the TZASC support; Add env config for tee support. Signed-off-by: Bai Ping <ping.bai@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 1f86ee60e72bb56af69a4128e8234e08c9bb1f59) (cherry picked from commit 819b988f3f1a8a207a380b09b4c71374b4b3ae0b) (cherry picked from commit 7d816e96f304a2a899efb675fda153ebe84775d2) (cherry picked from commit 53889189eca457cc915d2270c0034f225d9719ed)
Diffstat (limited to 'board')
-rw-r--r--board/freescale/mx6sllevk/imximage.cfg6
-rw-r--r--board/freescale/mx6sllevk/mx6sllevk.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/board/freescale/mx6sllevk/imximage.cfg b/board/freescale/mx6sllevk/imximage.cfg
index 74b3a907bf2..3d36dc6e5f0 100644
--- a/board/freescale/mx6sllevk/imximage.cfg
+++ b/board/freescale/mx6sllevk/imximage.cfg
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
*
* Refer docs/README.imxmage for more details about how-to configure
* and create imximage boot image
@@ -52,6 +53,11 @@ DATA 4 0x020c4078 0xffffffff
DATA 4 0x020c407c 0xffffffff
DATA 4 0x020c4080 0xffffffff
+#ifdef CONFIG_IMX_OPTEE
+DATA 4 0x20e4024 0x00000001
+CHECK_BITS_SET 4 0x20e4024 0x1
+#endif
+
DATA 4 0x020E0550 0x00080000
DATA 4 0x020E0534 0x00000000
DATA 4 0x020E02AC 0x00000030
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index 7d5d370583c..5f0ce599d40 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -427,6 +427,12 @@ int board_init(void)
int board_late_init(void)
{
+
+ env_set("tee", "no");
+#ifdef CONFIG_IMX_OPTEE
+ env_set("tee", "yes");
+#endif
+
#ifdef CONFIG_ENV_IS_IN_MMC
board_late_mmc_env_init();
#endif