toradex: enable using another distro boot script for TEZI

The distro boot script for TEZI has another name to prevent u-boot of
regular BSP trying to boot TEZI image. Expand the usage of
TDX_EASY_INSTALLER Kconfig option to seek and use the TEZI-specific
name of the script.

Related-to: TEI-791
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

7 files changed, 53 insertions, 8 deletions

diff --git a/board/toradex/common/Kconfig b/board/toradex/common/Kconfig
index d2431da739..5327444e6e 100644
--- a/board/toradex/common/Kconfig
+++ b/board/toradex/common/Kconfig
@@ -99,5 +99,6 @@ endif
 config TDX_EASY_INSTALLER
 	bool "Use Toradex Easy Installer specific options."
 	help
-	  Use Toradex Easy Installer specific options. Currently this is only
-	  needed to choose the correct ubiboot options for Easy Installer.
+	  Use Toradex Easy Installer specific options. Currently this is
+	  needed to choose the correct ubiboot options and use correct
+	  name of distro boot script for Easy Installer.
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 848a5aa566..a47530f051 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -69,8 +69,15 @@
 	"update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \
 		"mmc write ${loadaddr} ${uboot_blk} ${blkcnt}\0" \
 
+#if defined(CONFIG_TDX_EASY_INSTALLER)
+#  define BOOT_SCRIPT	"boot-tezi.scr"
+#else
+#  define BOOT_SCRIPT   "boot.scr"
+#endif
+
 #define BOARD_EXTRA_ENV_SETTINGS \
-	"boot_script_dhcp=boot.scr\0" \
+	"boot_scripts=" BOOT_SCRIPT "\0" \
+	"boot_script_dhcp=" BOOT_SCRIPT "\0" \
 	"boot_file=zImage\0" \
 	"console=ttyS0\0" \
 	"defargs=lp0_vec=2064@0xf46ff000 core_edp_mv=1150 core_edp_ma=4000 " \
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 0cbab6de76..d77b8ab506 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -131,9 +131,17 @@
 #else
 #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
 #endif
+
+#if defined(CONFIG_TDX_EASY_INSTALLER)
+#  define BOOT_SCRIPT	"boot-tezi.scr"
+#else
+#  define BOOT_SCRIPT   "boot.scr"
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
-	"boot_script_dhcp=boot.scr\0" \
+	"boot_scripts=" BOOT_SCRIPT "\0" \
+	"boot_script_dhcp=" BOOT_SCRIPT "\0" \
 	"bootcmd=run distro_bootcmd ; " \
 		"usb start ; " \
 		"setenv stdout serial,vidconsole; " \
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 779ef4109f..d7bac0a6bd 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -85,12 +85,19 @@
 
 #define DFU_ALT_NAND_INFO "imx6ull-bcb part 0,1;u-boot1 part 0,2;u-boot2 part 0,3;u-boot-env part 0,4;ubi partubi 0,5"
 
+#if defined(CONFIG_TDX_EASY_INSTALLER)
+#  define BOOT_SCRIPT	"boot-tezi.scr"
+#else
+#  define BOOT_SCRIPT   "boot.scr"
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	UBI_BOOTCMD \
 	UBOOT_UPDATE \
-	"boot_script_dhcp=boot.scr\0" \
+	"boot_scripts=" BOOT_SCRIPT "\0" \
+	"boot_script_dhcp=" BOOT_SCRIPT "\0" \
 	"bootubipart=ubi\0" \
 	"console=ttymxc0\0" \
 	"defargs=user_debug=30\0" \
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 6a8633c1bc..212a750161 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -113,9 +113,17 @@
 	"scriptaddr=0x17000000\0"
 
 #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
+
+#if defined(CONFIG_TDX_EASY_INSTALLER)
+#  define BOOT_SCRIPT	"boot-tezi.scr"
+#else
+#  define BOOT_SCRIPT   "boot.scr"
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
-	"boot_script_dhcp=boot.scr\0" \
+	"boot_scripts=" BOOT_SCRIPT "\0" \
+	"boot_script_dhcp=" BOOT_SCRIPT "\0" \
 	"bootcmd=run distro_bootcmd; " \
 		"usb start ; " \
 		"setenv stdout serial,vidconsole; " \
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 0ecc7aa8ae..3f3d0078c7 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -147,12 +147,19 @@
 #endif
 #include <config_distro_bootcmd.h>
 
+#if defined(CONFIG_TDX_EASY_INSTALLER)
+#  define BOOT_SCRIPT	"boot-tezi.scr"
+#else
+#  define BOOT_SCRIPT   "boot.scr"
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	MODULE_EXTRA_ENV_SETTINGS \
 	UBOOT_UPDATE \
-	"boot_script_dhcp=boot.scr\0" \
+	"boot_scripts=" BOOT_SCRIPT "\0" \
+	"boot_script_dhcp=" BOOT_SCRIPT "\0" \
 	"boot_file=zImage\0" \
 	"bootm_boot_mode=sec\0" \
 	"bootubipart=ubi\0" \
diff --git a/include/configs/colibri_imx7_tezi_recovery.h b/include/configs/colibri_imx7_tezi_recovery.h
index 9aee0bfa0c..fa9c35e0dd 100644
--- a/include/configs/colibri_imx7_tezi_recovery.h
+++ b/include/configs/colibri_imx7_tezi_recovery.h
@@ -68,12 +68,19 @@
 
 #undef CONFIG_ISO_PARTITION
 
+#if defined(CONFIG_TDX_EASY_INSTALLER)
+#  define BOOT_SCRIPT	"boot-tezi.scr"
+#else
+#  define BOOT_SCRIPT   "boot.scr"
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	MODULE_EXTRA_ENV_SETTINGS \
 	UBOOT_UPDATE \
-	"boot_script_dhcp=boot.scr\0" \
+	"boot_scripts=" BOOT_SCRIPT "\0" \
+	"boot_script_dhcp=" BOOT_SCRIPT "\0" \
 	"boot_file=zImage\0" \
 	"bootm_boot_mode=sec\0" \
 	"bootubipart=ubi\0" \