From: Tim Harvey <tharvey@gateworks.com>
Date: Fri, 18 Feb 2022 23:20:17 +0000 (-0800)
Subject: imx8m{m,n}_venice: update boot_net script to load fdt
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=f3722dd6dad4ddaacbb06b0ae2f7a63272ecb078;p=u-boot.git

imx8m{m,n}_venice: update boot_net script to load fdt

Update the 'boot_net' script to load the fdt with the kernel.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Reviewed-by: Fabio Estevam <festevam@denx.de>
---

diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index 1952bde858..eee59a4ca5 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -60,9 +60,22 @@
 		"setexpr blkcnt $blkcnt / 0x200 && " \
 		"mmc dev $dev && " \
 		"mmc write $loadaddr 0x42 $blkcnt\0" \
+	"loadfdt=" \
+		"if $fsload $fdt_addr_r $dir/$fdt_file1; " \
+			"then echo loaded $fdt_file1; " \
+		"elif $fsload $fdt_addr_r $dir/$fdt_file2; " \
+			"then echo loaded $fdt_file2; " \
+		"elif $fsload $fdt_addr_r $dir/$fdt_file3; " \
+			"then echo loaded $fdt_file3; " \
+		"elif $fsload $fdt_addr_r $dir/$fdt_file4; " \
+			"then echo loaded $fdt_file4; " \
+		"elif $fsload $fdt_addr_r $dir/$fdt_file5; " \
+			"then echo loaded $fdt_file5; " \
+		"fi\0" \
 	"boot_net=" \
-		"tftpboot $kernel_addr_r $image && " \
-		"booti $kernel_addr_r - $fdtcontroladdr\0" \
+		"setenv fsload tftpboot; " \
+		"run loadfdt && tftpboot $kernel_addr_r $dir/Image && " \
+		"booti $kernel_addr_r - $fdt_addr_r\0" \
 	"update_rootfs=" \
 		"tftpboot $loadaddr $image && " \
 		"gzwrite mmc $dev $loadaddr $filesize 100000 1000000\0" \
diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h
index d954e8e3c5..d977d32652 100644
--- a/include/configs/imx8mn_venice.h
+++ b/include/configs/imx8mn_venice.h
@@ -57,9 +57,22 @@
 		"setexpr blkcnt $blkcnt / 0x200 && " \
 		"mmc dev $dev && " \
 		"mmc write $loadaddr 0x40 $blkcnt\0" \
+	"loadfdt=" \
+		"if $fsload $fdt_addr_r $dir/$fdt_file1; " \
+			"then echo loaded $fdt_file1; " \
+		"elif $fsload $fdt_addr_r $dir/$fdt_file2; " \
+			"then echo loaded $fdt_file2; " \
+		"elif $fsload $fdt_addr_r $dir/$fdt_file3; " \
+			"then echo loaded $fdt_file3; " \
+		"elif $fsload $fdt_addr_r $dir/$fdt_file4; " \
+			"then echo loaded $fdt_file4; " \
+		"elif $fsload $fdt_addr_r $dir/$fdt_file5; " \
+			"then echo loaded $fdt_file5; " \
+		"fi\0" \
 	"boot_net=" \
-		"tftpboot $kernel_addr_r $image && " \
-		"booti $kernel_addr_r - $fdtcontroladdr\0" \
+		"setenv fsload tftpboot; " \
+		"run loadfdt && tftpboot $kernel_addr_r $dir/Image && " \
+		"booti $kernel_addr_r - $fdt_addr_r\0" \
 	"update_rootfs=" \
 		"tftpboot $loadaddr $image && " \
 		"gzwrite mmc $dev $loadaddr $filesize 100000 1000000\0" \