summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTim Harvey <tharvey@gateworks.com>2022-02-19 02:20:17 +0300
committerStefano Babic <sbabic@denx.de>2022-04-12 22:08:22 +0300
commitf3722dd6dad4ddaacbb06b0ae2f7a63272ecb078 (patch)
tree1a75f66c646653c9c95598056399673f476f5bfd /include
parentca161222e5d9da4f930c2a248ed0829d23900e50 (diff)
downloadu-boot-f3722dd6dad4ddaacbb06b0ae2f7a63272ecb078.tar.xz
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>
Diffstat (limited to 'include')
-rw-r--r--include/configs/imx8mm_venice.h17
-rw-r--r--include/configs/imx8mn_venice.h17
2 files changed, 30 insertions, 4 deletions
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" \