MLK-17123 imx: fix mfgtool bootcmd

Fix mfgtool bootcmd error

Signed-off-by: Peng Fan <peng.fan@nxp.com>

11 files changed, 42 insertions, 11 deletions

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 9fe60abfe9..a3c3729a1e 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -126,5 +126,8 @@ defined(CONFIG_MX6DL)) && !defined(CONFIG_MX6S)
 
 #ifdef CONFIG_IMX_OPTEE
 #define CONFIG_SYS_MEM_TOP_HIDE	SZ_32M
+#define TEE_ENV "tee=yes\0"
+#else
+#define TEE_ENV "tee=no\0"
 #endif
 #endif
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 545f103235..97e0017212 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -66,8 +66,8 @@
 			"if test ${tee} = yes; then " \
 				"bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
 			"else " \
-				"bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
-
+				"bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
+			"fi;\0"
 
 #ifdef CONFIG_SUPPORT_EMMC_BOOT
 #define EMMC_ENV \
@@ -102,6 +102,7 @@
 	 */
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"fdt_addr=0x18000000\0" \
 	"fdt_high=0xffffffff\0"	  \
 	"bootargs=console=" CONSOLE_DEV ",115200 ubi.mtd=5 "  \
@@ -121,6 +122,7 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 		CONFIG_MFG_ENV_SETTINGS \
+		TEE_ENV \
 		"fdt_addr=0x18000000\0" \
 		"fdt_high=0xffffffff\0"   \
 		"bootargs=console=" CONSOLE_DEV ",115200 \0"\
@@ -140,6 +142,7 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"epdc_waveform=epdc_splash.bin\0" \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 0e77e053be..adb2dcc0ba 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -76,10 +76,12 @@
 		"if test ${tee} = yes; then " \
 			"bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
 		"else " \
-			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
+			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
+		"fi;\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"epdc_waveform=epdc_splash.bin\0" \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index 967bfbdfb9..3f83770700 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -40,10 +40,12 @@
 		"if test ${tee} = yes; then " \
 			"bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
 		"else " \
-			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
+			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
+		"fi;\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"epdc_waveform=epdc_splash.bin\0" \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index e9a9049175..c88668a3e8 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -81,11 +81,13 @@
 		"if test ${tee} = yes; then " \
 			"bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
 		"else " \
-			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
+			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
+		"fi;\0"
 
 #if defined(CONFIG_NAND_BOOT)
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"panel=Hannstar-XGA\0" \
 	"fdt_addr=0x83000000\0" \
 	"fdt_high=0xffffffff\0"	  \
@@ -107,6 +109,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	UPDATE_M4_ENV \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 92ae9ce916..ccc2f9c09d 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -75,11 +75,13 @@
 		"if test ${tee} = yes; then " \
 			"bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
 		"else " \
-			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
+			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
+		"fi;\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
 	UPDATE_M4_ENV \
+	TEE_ENV \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index d3012eaeb7..ff005ab899 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -106,11 +106,13 @@
 		"if test ${tee} = yes; then " \
 			"bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
 		"else " \
-			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
+			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
+		"fi;\0"
 
 #if defined(CONFIG_NAND_BOOT)
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"panel=TFT43AB\0" \
 	"fdt_addr=0x83000000\0" \
 	"fdt_high=0xffffffff\0"	  \
@@ -132,6 +134,7 @@
 #else
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index d5986569bb..d576838910 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -101,11 +101,13 @@
 		"if test ${tee} = yes; then " \
 			"bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
 		"else " \
-			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
+			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
+		"fi;\0"
 
 #if defined(CONFIG_NAND_BOOT)
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"panel=TFT43AB\0" \
 	"fdt_addr=0x83000000\0" \
 	"fdt_high=0xffffffff\0"	  \
@@ -127,6 +129,7 @@
 #else
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 970c6d91da..c3939b047d 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -76,5 +76,8 @@
 
 #ifdef CONFIG_IMX_OPTEE
 #define CONFIG_SYS_MEM_TOP_HIDE	SZ_32M
+#define TEE_ENV "tee=yes\0"
+#else
+#define TEE_ENV "tee=no\0"
 #endif
 #endif
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index e938e679fd..87c78783d5 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -131,7 +131,8 @@
 		"if test ${tee} = yes; then " \
 			"bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
 		"else " \
-			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
+			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
+		"fi;\0"
 
 #define CONFIG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=image raw 0 0x800000;"\
@@ -142,6 +143,7 @@
 #if defined(CONFIG_NAND_BOOT)
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"panel=TFT43AB\0" \
 	"fdt_addr=0x83000000\0" \
 	"fdt_high=0xffffffff\0"	  \
@@ -163,6 +165,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	UPDATE_M4_ENV \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	CONFIG_DFU_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index c0460cb677..7d07dea102 100644
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -121,11 +121,12 @@
 			"if test ${tee} = yes; then " \
 				"bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
 			"else " \
-				"bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
-	
+				"bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
+			"fi;\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttyLP0\0" \
@@ -271,5 +272,8 @@
 
 #ifdef CONFIG_IMX_OPTEE
 #define CONFIG_SYS_MEM_TOP_HIDE	SZ_32M
+#define TEE_ENV "tee=yes\0"
+#else
+#define TEE_ENV "tee=no\0"
 #endif
 #endif	/* __CONFIG_H */