On Sun, 2019-01-06 at 22:00 +0100, Stefan Agner wrote:
> From: Stefan Agner <stefan.ag...@toradex.com>
>
> Fix mixed up boot commands between raw NAND and eMMC variant. Also
> make sure that the boot_file is defined for the eMMC boot command.
>
> Fixes: a62c60610f51 ("colibri_imx7_emmc: add Colibri iMX7D 1GB (eMMC)
> module support")
> Signed-off-by: Stefan Agner <stefan.ag...@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswi...@toradex.com>
> ---
>
> include/configs/colibri_imx7.h | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/include/configs/colibri_imx7.h
> b/include/configs/colibri_imx7.h
> index c31cf2888a..5a4b9801cb 100644
> --- a/include/configs/colibri_imx7.h
> +++ b/include/configs/colibri_imx7.h
> @@ -110,13 +110,13 @@
> "run fdt_fixup && bootz ${kernel_addr_r} -
> ${fdt_addr_r}\0" \
>
> #if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
> -#define CONFIG_BOOTCOMMAND "run emmcboot ; echo ; echo emmcboot
> failed ; " \
> +#define CONFIG_BOOTCOMMAND "run ubiboot ; echo ; echo ubiboot failed
> ; " \
> "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run
> distro_bootcmd;"
> #define MODULE_EXTRA_ENV_SETTINGS \
> "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
> UBI_BOOTCMD
> #elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
> -#define CONFIG_BOOTCOMMAND "run ubiboot ; echo ; echo ubiboot failed
> ; " \
> +#define CONFIG_BOOTCOMMAND "run emmcboot ; echo ; echo emmcboot
> failed ; " \
> "setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb && run
> distro_bootcmd;"
> #define MODULE_EXTRA_ENV_SETTINGS \
> "variant=-emmc\0" \
> @@ -143,6 +143,7 @@
> NFS_BOOTCMD \
> SD_BOOTCMD \
> MODULE_EXTRA_ENV_SETTINGS \
> + "boot_file=zImage\0" \
> "console=ttymxc0\0" \
> "defargs=\0" \
> "fdt_board=eval-v3\0" \
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
