From 0b4e421e230ae478150c893f93daa6836e60ffd2 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Thu, 9 May 2019 01:53:50 -0700 Subject: [PATCH] MLK-17123 imx: add tee environment variable Add tee environment variable to fix mfgtool/uuu bootcmd error Signed-off-by: Peng Fan (cherry picked from commit 2604fd8bdcd0c36d17899b01f370fd4507cea33e) Signed-off-by: Ye Li (cherry picked from commit e8f86c28bdb867a2d020a02140722661ebbae467) --- include/configs/mx6_common.h | 5 +++++ include/configs/mx7_common.h | 5 +++++ include/configs/mx7ulp_evk.h | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index fc8388f73d..5431c07636 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -72,4 +72,9 @@ #endif #endif +#ifdef CONFIG_IMX_OPTEE +#define TEE_ENV "tee=yes\0" +#else +#define TEE_ENV "tee=no\0" +#endif #endif diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index b598ac1fe9..2068e38a77 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -57,5 +57,10 @@ #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #endif #endif + +#ifdef CONFIG_IMX_OPTEE +#define TEE_ENV "tee=yes\0" +#else +#define TEE_ENV "tee=no\0" #endif #endif diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 0caa77c1c7..a5225e95fc 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -202,4 +202,9 @@ #define CONFIG_OF_SYSTEM_SETUP +#ifdef CONFIG_IMX_OPTEE +#define TEE_ENV "tee=yes\0" +#else +#define TEE_ENV "tee=no\0" +#endif #endif /* __CONFIG_H */ -- 2.17.1