toradex boards: sdboot cosmetic clean-upColibri-iMX7_LXDE-Image_2.8b4.129-20181005Colibri-iMX6_LXDE-Image_2.8b4.129-20181005Colibri-iMX6ULL_LXDE-Image_2.8b4.129-20181005Colibri-VF_LXDE-Image_2.8b4.129-20181005Colibri-T30_LXDE-Image_2.8b4.129-20181005Colibri-T20_LXDE-Image_2.8b4.129-20181005Apalis-iMX6_LXDE-Image_2.8b4.129-20181005Apalis-TK1_LXDE-Image_2.8b4.129-20181005Apalis-TK1-Mainline_LXDE-Image_2.8b4.129-20181005Apalis-T30_LXDE-Image_2.8b4.129-20181005

The whole thing meanwhile diverged heavily. Fix this.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Philippe Schenker <philippe.schenker@toradex.com>

10 files changed, 53 insertions, 67 deletions

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 0d70e800af1..f9c2780a6bf 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -115,10 +115,9 @@
 #define SD_BOOTCMD \
 	"sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \
 	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
-		"${vidargs}; echo Booting from SD card in 8bit slot...; " \
-		"run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
-		"${boot_file} && run fdt_fixup && " \
-		"bootz ${kernel_addr_r} - ${dtbparam}\0" \
+		"${vidargs}; echo Booting from MMC/SD card in 8-bit slot...; " \
+		"run sddtbload; load mmc 1:1 ${kernel_addr_r} ${boot_file} " \
+		"&& run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \
 	"sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
 		"${soc}-${fdt_module}-${fdt_board}.dtb " \
 		"&& setenv dtbparam ${fdt_addr_r}\0"
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 125241cdf4d..e413ae347a6 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -236,14 +236,11 @@
 		"&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
 
 #define SD_BOOTCMD \
-	"sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 " \
-		"rootwait\0" \
-	"sdboot=run setup; " \
-		"setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
-		"${vidargs}; echo Booting from SD card; " \
-		"run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
-		"${boot_file} && run fdt_fixup && " \
-		"bootz ${kernel_addr_r} ${dtbparam}\0" \
+	"sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \
+	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
+		"${vidargs}; echo Booting from MMC/SD card in 8-bit slot...; " \
+		"run sddtbload; load mmc 1:1 ${kernel_addr_r} ${boot_file} " \
+		"&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \
 	"sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
 		"${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
 
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 96ff42a30c4..4286cdaa7a1 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -126,13 +126,11 @@
 		"&& setenv dtbparam ${fdt_addr_r}\0"
 
 #define SD_BOOTCMD \
-	"sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext3 " \
-		"rootwait\0" \
+	"sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext3 rootwait\0" \
 	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
-		"${vidargs}; echo Booting from SD card in 8bit slot...; " \
-		"run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
-		"${boot_file} && run fdt_fixup && " \
-		"bootz ${kernel_addr_r} - ${dtbparam}\0" \
+		"${vidargs}; echo Booting from MMC/SD card in 8-bit slot...; " \
+		"run sddtbload; load mmc 1:1 ${kernel_addr_r} ${boot_file} " \
+		"&& run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \
 	"sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
 		"${soc}-apalis-${fdt_board}.dtb " \
 		"&& setenv dtbparam ${fdt_addr_r}\0"
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 32662cfe1c2..d61e307a08f 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -82,15 +82,15 @@
 		"${setupargs} ${vidargs}; echo Booting from NFS...;" \
 		"dhcp ${kernel_addr_r} && " \
 		"tftp ${fdt_addr_r} " FDT_FILE " && " \
-		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
 
 #define SD_BOOTCMD \
 	"sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \
-	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
-	"${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
-	"load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
-	"load mmc 0:1 ${fdt_addr_r} " FDT_FILE " && " \
-	"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
+		"${vidargs}; echo Booting from MMC/SD card...; " \
+		"load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
+		"load mmc 0:1 ${fdt_addr_r} " FDT_FILE " && " \
+		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
 
 #ifdef CONFIG_TDX_EASY_INSTALLER
 #define UBI_BOOTCMD \
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index fa2a0ffe05f..fda171bd9ea 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -216,14 +216,11 @@
 		"&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
 
 #define SD_BOOTCMD \
-	"sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 " \
-		"rootwait\0" \
-	"sdboot=run setup; " \
-		"setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
-		"${vidargs}; echo Booting from SD card; " \
-		"run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
-		"${boot_file} && run fdt_fixup && " \
-		"bootz ${kernel_addr_r} ${dtbparam}\0" \
+	"sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \
+	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
+		"${vidargs}; echo Booting from MMC/SD card; run sddtbload; " \
+		"load mmc 1:1 ${kernel_addr_r} ${boot_file} && run fdt_fixup " \
+		"&& bootz ${kernel_addr_r} ${dtbparam}\0" \
 	"sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
 		"${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
 
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 3903591f9a6..ea98570b90a 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -81,16 +81,15 @@
 		"${setupargs} ${vidargs}; echo Booting from NFS...;" \
 		"dhcp ${kernel_addr_r} && " \
 		"tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
-		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
 
 #define SD_BOOTCMD \
 	"sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \
-	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
-	"${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
-	"run m4boot && " \
-	"load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
-	"load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
-	"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
+		"${vidargs}; echo Booting from MMC/SD card...; run m4boot && " \
+		"load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
+		"load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb " \
+		"&& run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
 
 #ifdef CONFIG_TDX_EASY_INSTALLER
 #define UBI_BOOTCMD \
diff --git a/include/configs/colibri_imx7_emmc.h b/include/configs/colibri_imx7_emmc.h
index 23d8eb94b15..9c49f885d8e 100644
--- a/include/configs/colibri_imx7_emmc.h
+++ b/include/configs/colibri_imx7_emmc.h
@@ -94,16 +94,16 @@
 		"${setupargs} ${vidargs}; echo Booting from NFS...;" \
 		"dhcp ${kernel_addr_r} && " \
 		"tftp ${fdt_addr_r} ${soc}-colibri-emmc-${fdt_board}.dtb && " \
-		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
 
 #define SD_BOOTCMD \
 	"sdargs=root=/dev/mmcblk1p2 ro rootwait\0" \
-	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
-	"${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
-	"run m4boot && " \
-	"load mmc 1:1 ${kernel_addr_r} ${kernel_file} && " \
-	"load mmc 1:1 ${fdt_addr_r} ${soc}-colibri-emmc-${fdt_board}.dtb && " \
-	"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
+		"${vidargs}; echo Booting from MMC/SD card...; run m4boot && " \
+		"load mmc 1:1 ${kernel_addr_r} ${kernel_file} && " \
+		"load mmc 1:1 ${fdt_addr_r} " \
+		"${soc}-colibri-emmc-${fdt_board}.dtb && run fdt_fixup && " \
+		"bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
 
 #ifdef CONFIG_TDX_EASY_INSTALLER
 #define CONFIG_BOOTCOMMAND "run distro_bootcmd"
diff --git a/include/configs/colibri_imx7_tezi_recovery.h b/include/configs/colibri_imx7_tezi_recovery.h
index 1f1922748ef..b4b1791962a 100644
--- a/include/configs/colibri_imx7_tezi_recovery.h
+++ b/include/configs/colibri_imx7_tezi_recovery.h
@@ -83,16 +83,15 @@
 		"${setupargs} ${vidargs}; echo Booting from NFS...;" \
 		"dhcp ${kernel_addr_r} && " \
 		"tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
-		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
 
 #define SD_BOOTCMD \
 	"sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \
-	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
-	"${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
-	"run m4boot && " \
-	"load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
-	"load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
-	"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
+		"${vidargs}; echo Booting from MMC/SD card...; run m4boot && " \
+		"load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
+		"load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb " \
+		"&& run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
 
 #define UBI_BOOTCMD \
 	"ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
@@ -103,7 +102,7 @@
 		"ubi part ubi && run m4boot && " \
 		"ubi read ${kernel_addr_r} kernel && " \
 		"ubi read ${fdt_addr_r} dtb && " \
-		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
 
 #define CONFIG_BOOTCOMMAND "run ubiboot; " \
 	"setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd"
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 6f53454baf9..b056c8f4b5a 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -116,15 +116,14 @@
 		"&& setenv dtbparam ${fdt_addr_r}\0"
 
 #define SD_BOOTCMD \
-	"sdargs=ip=off root=/dev/mmcblk0p2 ro rootfstype=ext3 " \
-		"rootwait\0" \
+	"sdargs=ip=off root=/dev/mmcblk0p2 ro rootfstype=ext3 rootwait\0" \
 	"sdboot=run setup; setenv bootargs ${defargs} ${mtdparts} ${sdargs} " \
-		"${setupargs} ${vidargs}; echo Booting from SD card...; " \
+		"${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
 		"run sddtbload; load mmc 0:1 ${kernel_addr_r} ${boot_file} " \
 		"&& run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \
 	"sddtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \
-		"${soc}-colibri-${fdt_board}.dtb " \
-		"&& setenv dtbparam ${fdt_addr_r}\0"
+		"${soc}-colibri-${fdt_board}.dtb && setenv dtbparam " \
+		"${fdt_addr_r}\0"
 
 #define UBI_BOOTCMD \
 	"ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 7fca72cb0d9..124dbdfdf23 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -111,16 +111,14 @@
 		"&& setenv dtbparam ${fdt_addr_r}\0"
 
 #define SD_BOOTCMD \
-	"sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext3 " \
-		"rootwait\0" \
+	"sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext3 rootwait\0" \
 	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
-		"${vidargs}; echo Booting from SD card in 8bit slot...; " \
-		"run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
-		"${boot_file} && run fdt_fixup && " \
-		"bootz ${kernel_addr_r} - ${dtbparam}\0" \
+		"${vidargs}; echo Booting from MMC/SD card...; run sddtbload;" \
+		" load mmc 1:1 ${kernel_addr_r} ${boot_file} && run fdt_fixup" \
+		" && bootz ${kernel_addr_r} - ${dtbparam}\0" \
 	"sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
-		"${soc}-colibri-${fdt_board}.dtb " \
-		"&& setenv dtbparam ${fdt_addr_r}\0"
+		"${soc}-colibri-${fdt_board}.dtb && setenv dtbparam " \
+		"${fdt_addr_r}\0"
 
 #define USB_BOOTCMD \
 	"usbargs=ip=off root=/dev/sda2 ro rootfstype=ext3 " \