mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
colibri_imx7: fix boot commands
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: a62c60610f
("colibri_imx7_emmc: add Colibri iMX7D 1GB (eMMC) module support")
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
This commit is contained in:
parent
9ec1791e6a
commit
2bc18ce570
1 changed files with 3 additions and 2 deletions
|
@ -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" \
|
||||
|
|
Loading…
Add table
Reference in a new issue