From: Ye Li <ye.li@nxp.com>
Date: Thu, 9 May 2019 08:53:50 +0000 (-0700)
Subject: MLK-17123 imx: add tee environment variable
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~538
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=8d40c8ebe718e5f919ab267253e2fe88b8b38375;p=u-boot.git

MLK-17123 imx: add tee environment variable

Add tee environment variable to fix mfgtool/uuu bootcmd error

Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 2604fd8bdcd0c36d17899b01f370fd4507cea33e)

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit e8f86c28bdb867a2d020a02140722661ebbae467)
(cherry picked from commit 0b4e421e230ae478150c893f93daa6836e60ffd2)
(cherry picked from commit 32a6fd10d774908ed89ee4c9023737784092e5db)
(cherry picked from commit ecbb26148d931187a506207c47bd153c5ac4f644)
---

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 580aa2b3a7..f2a0fe4134 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -63,4 +63,9 @@
 #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
 #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 f25fefc455..7f88ad6ab4 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -56,4 +56,10 @@
 #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 514feea979..5bc1af85ec 100644
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -139,4 +139,9 @@
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
+#ifdef CONFIG_IMX_OPTEE
+#define TEE_ENV "tee=yes\0"
+#else
+#define TEE_ENV "tee=no\0"
+#endif
 #endif	/* __CONFIG_H */