]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
am335x, guardian: update boot mechanism
authorMoses Christopher <BollavarapuMoses.Christopher@in.bosch.com>
Wed, 25 Mar 2020 06:45:48 +0000 (06:45 +0000)
committerLokesh Vutla <lokeshvutla@ti.com>
Tue, 14 Apr 2020 10:14:48 +0000 (15:44 +0530)
- Add a boot logic in the distro boot command
  - Add fallback mechanism in alternate boot command
  - Keep single boot target -> ubifs0

Signed-off-by: Moses Christopher <BollavarapuMoses.Christopher@in.bosch.com>
include/configs/am335x_guardian.h

index 1ac5e2e240e3cabb4cd67c89a81e4ad0c276ed7e..c34c07a493c85382de40387843363d45c2c76e6e 100644 (file)
@@ -34,9 +34,7 @@
        "ramdisk_addr_r=0x88080000\0" \
 
 #define BOOT_TARGET_DEVICES(func) \
-       func(UBIFS, ubifs, 0) \
-       func(PXE, pxe, na) \
-       func(DHCP, dhcp, na)
+       func(UBIFS, ubifs, 0)
 
 #define AM335XX_BOARD_FDTFILE "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0"
 
        BOOTENV \
        GUARDIAN_DEFAULT_PROD_ENV \
        "bootubivol=rootfs\0" \
+       "distro_bootcmd=" \
+               "setenv autoload no; " \
+               "setenv rootflags \"bulk_read,chk_data_crc\"; " \
+               "setenv ethact usb_ether; " \
+               "if test \"${swi_status}\" -eq 1; then " \
+                 "setenv extrabootargs \"swi_attached\"; " \
+                 "if dhcp; then " \
+                   "sleep 1; " \
+                   "if tftp \"${tftp_load_addr}\" \"bootscript.scr\"; then " \
+                     "source \"${tftp_load_addr}\"; " \
+                   "fi; " \
+                 "fi; " \
+               "fi;" \
+               "run bootcmd_ubifs0;\0" \
        "altbootcmd=" \
-               "setenv boot_config \"extlinux-rollback.conf\"; " \
-               "run distro_bootcmd\0"
+               "setenv boot_syslinux_conf \"extlinux/extlinux-rollback.conf\"; " \
+               "run distro_bootcmd; " \
+               "setenv boot_syslinux_conf \"extlinux/extlinux.conf\"; " \
+               "run bootcmd_ubifs0;\0"
 
 #endif /* ! CONFIG_SPL_BUILD */