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 580aa2b..f2a0fe4 100644 (file)
--- 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 f25fefc..7f88ad6 100644 (file)
--- 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 514feea..5bc1af8 100644 (file)
--- 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 */