mirror of
https://github.com/Fishwaldo/build.git
synced 2025-04-05 13:42:01 +00:00
2b2b934e40
USB controller config tested on Base only Fix u-boot default environment and build options
51 lines
2.2 KiB
Diff
51 lines
2.2 KiB
Diff
diff --git a/board/mv_ebu/a38x/mv_main_a38x.c b/board/mv_ebu/a38x/mv_main_a38x.c
|
|
index 4b43a9c..748746e 100755
|
|
--- a/board/mv_ebu/a38x/mv_main_a38x.c
|
|
+++ b/board/mv_ebu/a38x/mv_main_a38x.c
|
|
@@ -661,25 +661,31 @@ void misc_init_r_env(void)
|
|
setenv("enaLPAE", "no");
|
|
#endif
|
|
|
|
- /* Flatten Device Tree environment setup */
|
|
-#ifdef CONFIG_CUSTOMER_BOARD_SUPPORT
|
|
- #ifdef CONFIG_ARMADA_38X
|
|
- fdt_env_setup("armada-38x.dtb", MV_FALSE); /* static setup: Skip DT update for customer */
|
|
- #else
|
|
- fdt_env_setup("armada-39x.dtb", MV_FALSE);
|
|
- #endif
|
|
-#else
|
|
- #ifdef CONFIG_ARMADA_38X
|
|
- fdt_env_setup("armada-38x-modular.dtb", MV_TRUE); /* dynamic setup: run DT update */
|
|
- #else
|
|
- fdt_env_setup("armada-39x.dtb", MV_FALSE); /* static setup: Skip DT update */
|
|
- #endif
|
|
-#endif
|
|
+ setenv("fdt_skip_update", "yes");
|
|
+ setenv("boot_a_script",
|
|
+ "ext4load ${boot_interface} 0:1 ${script_addr_r} boot/boot.scr || \
|
|
+ ext4load ${boot_interface} 0:1 ${script_addr_r} boot.scr; source ${script_addr_r}");
|
|
+ setenv("mmcboot",
|
|
+ "setenv boot_interface mmc; run boot_a_script;");
|
|
+ setenv("sataboot",
|
|
+ "scsi init; setenv boot_interface scsi; run boot_a_script;");
|
|
+ setenv("usbboot",
|
|
+ "setenv usbActive 1; setenv usbType 3; usb start; setenv boot_interface usb; run boot_a_script;");
|
|
|
|
#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 boot from MMC; run mmcboot;"
|
|
+#elif defined (MV_SATA_BOOT)
|
|
+ "echo Trying to boot from SATA; run sataboot;"
|
|
+#elif defined (MV_NOR_BOOT)
|
|
+ "echo Please store the boot environment on the NOR SPI flash to override the default boot sequence;"
|
|
+#endif /* MV_NOR_BOOT */
|
|
+ "echo Trying to boot from USB; run usbboot;"
|
|
+ "echo Default boot sequence failed - falling back to TFTP;"
|
|
+ "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;");
|