]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
apalis_imx6: use both sd/mmc interfaces for setsdupdate
authorMax Krummenacher <max.krummenacher@toradex.com>
Fri, 8 Feb 2019 17:12:18 +0000 (18:12 +0100)
committerStefano Babic <sbabic@denx.de>
Sat, 13 Apr 2019 18:30:08 +0000 (20:30 +0200)
During porting to 2016.11 the check of a SD (mmc2) interface
was dropped, this was unintended.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
include/configs/apalis_imx6.h

index 5f865e1f08a01f97708060e0a215d03e99b13fca..7df32feb0d7dfa22de522523d669b5b91ad09530 100644 (file)
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
                "flash_eth.img && source ${loadaddr}\0" \
-       "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; load " \
-               "${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
+       "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \
+               "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img " \
+               "|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1" \
+               " ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
        "setup=setenv setupargs fec_mac=${ethaddr} " \
                "consoleblank=0 no_console_suspend=1 console=tty1 " \