diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-09-28 14:40:23 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-09-28 15:49:21 +0200 |
commit | 07edca0bb81857a339f26f3465d5c5602705a94d (patch) | |
tree | 8668e85e64dbe5deb144e45f2eed5dfe0adfafc3 /include/configs/apalis-tk1.h | |
parent | 3c7a83614b6ec9a1dd76c2313d17343b17f4eeb0 (diff) |
toradex boards: sdboot cosmetic clean-upColibri-iMX7_LXDE-Image_2.8b4.129-20181005Colibri-iMX6_LXDE-Image_2.8b4.129-20181005Colibri-iMX6ULL_LXDE-Image_2.8b4.129-20181005Colibri-VF_LXDE-Image_2.8b4.129-20181005Colibri-T30_LXDE-Image_2.8b4.129-20181005Colibri-T20_LXDE-Image_2.8b4.129-20181005Apalis-iMX6_LXDE-Image_2.8b4.129-20181005Apalis-TK1_LXDE-Image_2.8b4.129-20181005Apalis-TK1-Mainline_LXDE-Image_2.8b4.129-20181005Apalis-T30_LXDE-Image_2.8b4.129-20181005
The whole thing meanwhile diverged heavily. Fix this.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Philippe Schenker <philippe.schenker@toradex.com>
Diffstat (limited to 'include/configs/apalis-tk1.h')
-rw-r--r-- | include/configs/apalis-tk1.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 0d70e800af1..f9c2780a6bf 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -115,10 +115,9 @@ #define SD_BOOTCMD \ "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \ "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ - "${vidargs}; echo Booting from SD card in 8bit slot...; " \ - "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ - "${boot_file} && run fdt_fixup && " \ - "bootz ${kernel_addr_r} - ${dtbparam}\0" \ + "${vidargs}; echo Booting from MMC/SD card in 8-bit slot...; " \ + "run sddtbload; load mmc 1:1 ${kernel_addr_r} ${boot_file} " \ + "&& run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \ "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ "${soc}-${fdt_module}-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" |