armbian-build/patch/u-boot/u-boot-armada/loading-boot.scr.patch
zador-blood-stained d1b4d110ab Add SATA and SPI NOR boot targets for Clearfog
Adjust Clearfog Base patches
2016-11-29 18:55:11 +03:00

23 lines
1.1 KiB
Diff

diff --git a/board/mv_ebu/a38x/mv_main_a38x.c b/board/mv_ebu/a38x/mv_main_a38x.c
index 4b43a9c..fa4aca4 100755
--- a/board/mv_ebu/a38x/mv_main_a38x.c
+++ b/board/mv_ebu/a38x/mv_main_a38x.c
@@ -679,7 +679,16 @@ void misc_init_r_env(void)
#if (CONFIG_BOOTDELAY >= 0)
env = getenv("bootcmd");
if (!env)
- setenv("bootcmd", "tftpboot 0x2000000 $image_name;tftpboot $fdtaddr $fdtfile;"
+ setenv("bootcmd",
+#if defined (MV_MMC_BOOT)
+ "echo Trying to load boot.scr from mmc; setenv boot_interface mmc;"
+#elif defined (MV_SATA_BOOT)
+ "scsi init; echo Trying to load boot.scr from sata; setenv boot_interface scsi;"
+#elif defined (MV_NOR_BOOT)
+ "echo Please store boot environment on NOR SPI flash;"
+#endif /* MV_NOR_BOOT */
+ "ext4load ${boot_interface} 0:1 ${script_addr_r} boot/boot.scr;source ${script_addr_r};"
+ "tftpboot 0x2000000 $image_name;tftpboot $fdtaddr $fdtfile;"
"setenv bootargs $console $nandEcc $mtdparts $bootargs_root nfsroot=$serverip:$rootpath "
"ip=$ipaddr:$serverip$bootargs_end $mvNetConfig video=dovefb:lcd0:$lcd0_params "
"clcd.lcd0_enable=$lcd0_enable clcd.lcd_panel=$lcd_panel; bootz 0x2000000 - $fdtaddr;");