diff options
| author | Bai Ping <ping.bai@nxp.com> | 2017-12-04 10:50:33 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2022-04-06 15:58:45 +0800 |
| commit | 56aa5cd1f05a18f9c3dac5861b02e7c05a78430d (patch) | |
| tree | 6b815f34a9ab6ad57e068e36475acf95adab5888 /board/freescale/mx6sllevk | |
| parent | 6aacb13e2e399303667b6dc8de3d5d1c5f8868a4 (diff) | |
MLK-17082 imx: add optee support for imx6sl/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)
(cherry picked from commit 2300844b9ce5992fc835605752fbbcee5be98a6b)
(cherry picked from commit 18fdda30a9da0f3f679bd4417d62bc0c6bd86d9f)
(cherry picked from commit 6cf02eb3e1ab05827d3bac454cd37c3e879b0c48)
(cherry picked from commit 440c802235b845bdb6e14ec98da9d8421b7a6aae)
Diffstat (limited to 'board/freescale/mx6sllevk')
| -rw-r--r-- | board/freescale/mx6sllevk/imximage.cfg | 6 | ||||
| -rw-r--r-- | board/freescale/mx6sllevk/mx6sllevk.c | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/board/freescale/mx6sllevk/imximage.cfg b/board/freescale/mx6sllevk/imximage.cfg index 550be3f6c1..87db25a016 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 @@ -51,6 +52,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 8748593596..ee29673193 100644 --- a/board/freescale/mx6sllevk/mx6sllevk.c +++ b/board/freescale/mx6sllevk/mx6sllevk.c @@ -30,6 +30,7 @@ #include <mxc_epdc_fb.h> #endif #include <asm/mach-imx/video.h> +#include <env.h> DECLARE_GLOBAL_DATA_PTR; @@ -429,6 +430,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 |