From 558ec9aed32d78630b0c231d986f3db0dd1d96d8 Mon Sep 17 00:00:00 2001 From: Silvano di Ninno Date: Wed, 28 Feb 2018 16:08:03 +0100 Subject: [PATCH] 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 Acked-by: Peng Fan --- include/configs/mx6slevk.h | 17 +++++++++-------- include/configs/mx6sllevk.h | 17 +++++++++-------- include/configs/mx6sxsabreauto.h | 17 +++++++++-------- include/configs/mx6sxsabresd.h | 17 +++++++++-------- 4 files changed, 36 insertions(+), 32 deletions(-) diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 6c0e45327b..29acd85f1d 100644 --- 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 ac6cc3d0c7..1c3153fa1a 100644 --- 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 f5c88597f5..6890d9140a 100644 --- 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 f980e863ee..08c81edde1 100644 --- 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;" \ -- 2.17.1