From: Michael Walle <michael@walle.cc>
Date: Wed, 17 Aug 2022 19:38:00 +0000 (+0200)
Subject: board: lsxl: reorder image loading and remove ramdisk_len
X-Git-Url: http://git.dujemihanovic.xyz/html/static/git-logo.png?a=commitdiff_plain;h=148b3aef9a6348a9363ec177bf718d32be3840ee;p=u-boot.git

board: lsxl: reorder image loading and remove ramdisk_len

We can load the ramdisk as the last step. This way we don't have to set
the intermediate variable 'ramdisk_len' and can remove it.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Stefan Roese <sr@denx.de>
---

diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index fb9a8c5032..7c2c0e22ad 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -34,25 +34,22 @@
 		"&& load sata ${hdpart} ${ramdisk_addr} /initrd.buffalo "\
 		"&& bootm ${kernel_addr} ${ramdisk_addr}\0"		\
 	"bootcmd_net=bootp ${kernel_addr} vmlinuz "			\
-		"&& tftpboot ${ramdisk_addr} initrd.img "		\
-		"&& setenv ramdisk_len ${filesize} "			\
 		"&& tftpboot ${fdt_addr} ${fdtfile} "			\
+		"&& tftpboot ${ramdisk_addr} initrd.img "		\
 		"&& bootz ${kernel_addr} "				\
-			"${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0"	\
+			"${ramdisk_addr}:${filesize} ${fdt_addr}\0"	\
 	"bootcmd_hdd=sata init "					\
 		"&& load sata ${hdpart} ${kernel_addr} /vmlinuz "	\
-		"&& load sata ${hdpart} ${ramdisk_addr} /initrd.img "	\
-		"&& setenv ramdisk_len ${filesize} "			\
 		"&& load sata ${hdpart} ${fdt_addr} /dtb "		\
+		"&& load sata ${hdpart} ${ramdisk_addr} /initrd.img "	\
 		"&& bootz ${kernel_addr} "				\
-			"${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0"	\
+			"${ramdisk_addr}:${filesize} ${fdt_addr}\0"	\
 	"bootcmd_usb=usb start "					\
 		"&& load usb 0:1 ${kernel_addr} /vmlinuz "		\
-		"&& load usb 0:1 ${ramdisk_addr} /initrd.img "		\
-		"&& setenv ramdisk_len ${filesize} "			\
 		"&& load usb 0:1 ${fdt_addr} ${fdtfile} "		\
+		"&& load usb 0:1 ${ramdisk_addr} /initrd.img "		\
 		"&& bootz ${kernel_addr} "				\
-			"${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0"	\
+			"${ramdisk_addr}:${filesize} ${fdt_addr}\0"	\
 	"bootcmd_rescue=run config_nc_dhcp; run nc\0"			\
 	"config_nc_dhcp=setenv autoload_old ${autoload}; "		\
 		"setenv autoload no "					\