]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
apalis-tk1: configs: remove legacy usbboot command
authorIgor Opaniuk <igor.opaniuk@toradex.com>
Tue, 25 Jun 2019 14:06:41 +0000 (17:06 +0300)
committerTom Warren <twarren@nvidia.com>
Fri, 9 Aug 2019 17:01:35 +0000 (10:01 -0700)
Remove obsolete legacy usbboot wrapper, as distroboot can handle
booting from USB drivers.

Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
include/configs/apalis-tk1.h

index a21975050a5f58385da2dd141680fbb8a9d71146..dacf36bf79c8ac327dd04bd2810181605c636e4c 100644 (file)
        "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
        "sdrootpart=2\0"
 
-#define USB_BOOTCMD \
-       "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} ro " \
-               "rootfstype=ext4 rootwait\0" \
-       "usbboot=run setup; usb start; run usbfinduuid; run set_usbargs; " \
-               "setenv bootargs ${defargs} ${setupargs} " \
-               "${usbargs} ${vidargs}; echo Booting from USB stick...; " \
-               "run usbdtbload; load usb ${usbdev}:${usbbootpart} " \
-               "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
-               "bootz ${kernel_addr_r} - ${dtbparam}\0" \
-       "usbbootpart=1\0" \
-       "usbdev=0\0" \
-       "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} " \
-               "${fdt_addr_r} ${soc}-${fdt_module}-${fdt_board}.dtb " \
-               "&& setenv dtbparam ${fdt_addr_r}\0" \
-       "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \
-       "usbrootpart=2\0"
-
 #define BOARD_EXTRA_ENV_SETTINGS \
        "boot_file=zImage\0" \
        "console=ttyS0\0" \
        "fdt_module=" FDT_MODULE "\0" \
        NFS_BOOTCMD \
        SD_BOOTCMD \
-       USB_BOOTCMD \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; pci enum && tftpboot ${loadaddr} " \
                "flash_eth.img && source ${loadaddr}\0" \
        "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
                "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
-       USB_BOOTCMD \
        "vidargs=fbcon=map:1\0"
 
 /* Increase console I/O buffer size */