MLK-17608: u-boot: fix findfdt environment variable

Fixes: 7101be554d2 (MLK-17608: u-boot: config: update dtb filename when OP-TEE is used)

fix regression with mx6sl, mx6sll, mx6sxsabreauto, mx6sxsabresd
fix missing "fi;\0" strings in the u-boot environment variable that lead
to findfdt command not being taken into account

Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>
Acked-by: Peng Fan <peng.fan@nxp.com>

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 6c0e453..29acd85 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -156,14 +156,15 @@
                        "else " \
                                "bootz; " \
                        "fi;" \
-               "findfdt="\
-                       "if test $fdt_file = undefined; then " \
-                               "if test ${tee} = yes; then " \
-                                       "setenv fdt_file imx6sl-evk-optee.dtb; " \
-                               "else " \
-                                       "setenv fdt_file imx6sl-evk.dtb; " \
-                               "fi; " \
-                       "fi;\0" \
+               "fi;\0" \
+       "findfdt="\
+               "if test $fdt_file = undefined; then " \
+                       "if test ${tee} = yes; then " \
+                               "setenv fdt_file imx6sl-evk-optee.dtb; " \
+                       "else " \
+                               "setenv fdt_file imx6sl-evk.dtb; " \
+                       "fi; " \
+               "fi;\0" \
 
 #define CONFIG_BOOTCOMMAND \
           "run findfdt;" \

diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index ac6cc3d..1c3153f 100644 (file)
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -121,14 +121,15 @@
                        "else " \
                                "bootz; " \
                        "fi;" \
-               "findfdt="\
-                       "if test $fdt_file = undefined; then " \
-                               "if test ${tee} = yes; then " \
-                                       "setenv fdt_file imx6sll-evk-optee.dtb; " \
-                               "else " \
-                                       "setenv fdt_file imx6sll-evk.dtb; " \
-                               "fi; " \
-                       "fi;\0" \
+               "fi;\0" \
+       "findfdt="\
+               "if test $fdt_file = undefined; then " \
+                       "if test ${tee} = yes; then " \
+                               "setenv fdt_file imx6sll-evk-optee.dtb; " \
+                       "else " \
+                               "setenv fdt_file imx6sll-evk.dtb; " \
+                       "fi; " \
+               "fi;\0" \
 
 #define CONFIG_BOOTCOMMAND \
           "run findfdt;" \

diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index f5c8859..6890d91 100644 (file)
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -175,14 +175,15 @@
                        "else " \
                                "bootz; " \
                        "fi;" \
-               "findfdt="\
-                       "if test $fdt_file = undefined; then " \
-                               "if test ${tee} = yes; then " \
-                                       "setenv fdt_file imx6sx-sabreauto-optee.dtb; " \
-                               "else " \
-                                       "setenv fdt_file imx6sx-sabreauto.dtb; " \
-                               "fi; " \
-                       "fi;\0" \
+               "fi;\0" \
+       "findfdt="\
+               "if test $fdt_file = undefined; then " \
+                       "if test ${tee} = yes; then " \
+                               "setenv fdt_file imx6sx-sdb-optee.dtb; " \
+                       "else " \
+                               "setenv fdt_file imx6sx-sdb.dtb; " \
+                       "fi; " \
+               "fi;\0" \
 
 #define CONFIG_BOOTCOMMAND \
           "run findfdt;" \

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index f980e86..08c81ed 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -156,14 +156,15 @@
                        "else " \
                                "bootz; " \
                        "fi;" \
-               "findfdt="\
-                       "if test $fdt_file = undefined; then " \
-                               "if test ${tee} = yes; then " \
-                                       "setenv fdt_file imx6sx-sdb-optee.dtb; " \
-                               "else " \
-                                       "setenv fdt_file imx6sx-sdb.dtb; " \
-                               "fi; " \
-                       "fi;\0" \
+               "fi;\0" \
+       "findfdt="\
+               "if test $fdt_file = undefined; then " \
+                       "if test ${tee} = yes; then " \
+                               "setenv fdt_file imx6sx-sdb-optee.dtb; " \
+                       "else " \
+                               "setenv fdt_file imx6sx-sdb.dtb; " \
+                       "fi; " \
+               "fi;\0" \
 
 #define CONFIG_BOOTCOMMAND \
           "run findfdt;" \