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

[Tim Harvey]

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

Signed-off-by: Tim Harvey <tharvey at gateworks.com>
---
 include/configs/imx8mm_venice.h | 17 +++++++++++++++--
 include/configs/imx8mn_venice.h | 17 +++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index cbb138229f67..fad304b22bdd 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -62,9 +62,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 4c95893be4fc..85a96537b066 100644
--- a/include/configs/imx8mn_venice.h
+++ b/include/configs/imx8mn_venice.h
@@ -59,9 +59,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" \
-- 
2.17.1