configs/colibri_vf.h: drop sdboot in favour of distro_bootcmd

The distro bootscript uses kernel_image to get the file name of
the kernel, so change that variable name.
UBI boot has precedence in the default boot command. If one wants
to boot from SD with a working NAND installation stop in U-Boot
and enter:

setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 7d17bd8e6a0cb55e11af2c3ae7c912c2c42c8107..012350d9bf6ec0ba9fd599bcf186e0922925a50d 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -69,21 +69,6 @@
        "tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
        "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 
-#define SD_BOOTCMD \
-       "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0"  \
-       "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
-       "setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \
-       "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
-       "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r} ${kernel_file} && " \
-       "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " \
-               "${soc}-colibri-${fdt_board}.dtb && " \
-       "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-       "sdbootpart=1\0" \
-       "sddev=0\0" \
-       "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
-       "sdrootpart=2\0"
-
-
 #define UBI_BOOTCMD \
        "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
        "ubi.fm_autoconvert=1\0" \
@@ -112,7 +97,6 @@
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
        NFS_BOOTCMD \
-       SD_BOOTCMD \
        UBI_BOOTCMD \
        UBOOT_UPDATE \
        "console=ttyLP0\0" \
@@ -120,7 +104,7 @@
        "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \
        "fdt_board=eval-v3\0" \
        "fdt_fixup=;\0" \
-       "kernel_file=zImage\0" \
+       "kernel_image=zImage\0" \
        "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "setsdupdate=mmc rescan && set interface mmc && " \
                "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \