From d00ef7887b8e3220facd36fd0b61de3283a3e1fd Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 13 Jun 2016 13:22:53 +0200 Subject: update.sh: make setupdate self contained 'run setupdate' tries a number of update media to find an update script and then sources it. Each media is probed by its own run setupdate, however if a script is found it is not sourced immediately but this task is delegated to 'run setupdate'. Thus one cannot just do a 'run setethupdate' to only try to update over Ethernet. This also unifies the functionality with Colibri VF and Colibri iMX7 were it has been implemented like this for a while now. While at it use consistently ${loadaddr}. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- include/configs/colibri_imx6.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'include/configs/colibri_imx6.h') diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index f33488bd8d..adc2d1e9c5 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -259,18 +259,18 @@ NFS_BOOTCMD \ SD_BOOTCMD \ "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \ - "00:14:2d:00:00:00; fi; tftpboot ${kernel_addr_r} " \ - "flash_eth.img\0" \ - "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \ - "load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img\0" \ + "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 && " \ + "source ${loadaddr}\0" \ "setup=setenv setupargs fec_mac=${ethaddr} " \ - "consoleblank=0 no_console_suspend=1 console=tty1 " \ + "consoleblank=0 no_console_suspend=1 console=tty1 " \ "console=${console},${baudrate}n8\0 " \ - "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \ - " source ${kernel_addr_r}\0" \ + "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \ - "load ${interface} ${drive}:1 ${kernel_addr_r} " \ - "flash_blk.img\0" \ + "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ + "source ${loadaddr}\0" \ "splashpos=m,m\0" \ "vidargs=video=mxcfb0:dev=lcd,640x480M@60,if=RGB666 " \ "video=mxcfb1:off fbmem=8M\0 " -- cgit v1.2.3