diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-04-28 02:12:43 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-04-28 02:12:43 +0200 |
| commit | 86100f49354df4a03e9c349f314595df6de3dfed (patch) | |
| tree | 370e5fea88a8bf3afc12513ea244321531123b02 /include | |
| parent | 3ce935e49c5c51006f150f34248e0e8d6217bb6f (diff) | |
apalis/colibri_t30: fix setupdate handling
Fix setupdate handling.
While at it also fix using asix_mac rather than igb_mac on Colibri T30.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/apalis_t30.h | 16 | ||||
| -rw-r--r-- | include/configs/colibri_t30.h | 21 |
2 files changed, 18 insertions, 19 deletions
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index a85ee7eabf..a5fe80f70d 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -162,20 +162,20 @@ "fdt_board=eval\0" \ NFS_BOOTCMD \ SD_BOOTCMD \ - "setethupdate=tftpboot ${kernel_addr_r} flash_eth.img " \ - "&& source ${kernel_addr_r}\0" \ + "setethupdate=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 " \ "|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1 " \ - "${kernel_addr_r} flash_blk.img && source ${kernel_addr_r}\0" \ + "${kernel_addr_r} flash_blk.img\0" \ "setup=setenv setupargs igb_mac=${ethaddr} " \ - "consoleblank=0 no_console_suspend=1 console=tty1 " \ + "consoleblank=0 no_console_suspend=1 console=tty1 " \ "console=${console},${baudrate}n8 debug_uartport=lsport,0 " \ "${memargs}\0" \ - "setusbupdate=setenv interface usb; setenv drive 1; " \ - "load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img " \ - "&& 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" \ + "setupdate=run setsdupdate || run setusbupdate || run setethupdate &&" \ + " source ${loadaddr}\0" \ USB_BOOTCMD \ "vidargs=video=tegrafb0:640x480-16@60 fbcon=map:1\0" diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 9012b6d20c..8818fa4902 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -152,19 +152,18 @@ "fdt_board=eval-v3\0" \ NFS_BOOTCMD \ SD_BOOTCMD \ - "setethupdate=tftpboot ${kernel_addr_r} flash_eth.img " \ - "&& source ${kernel_addr_r}\0" \ - "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \ - "load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img " \ - "&& source ${kernel_addr_r}\0" \ - "setup=setenv setupargs igb_mac=${ethaddr} " \ - "consoleblank=0 no_console_suspend=1 console=tty1 " \ + "setethupdate=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" \ + "setup=setenv setupargs asix_mac=${ethaddr} " \ + "consoleblank=0 no_console_suspend=1 console=tty1 " \ "console=${console},${baudrate}n8 debug_uartport=lsport,0 " \ "vmalloc=128M mem=1012M@2048M fbmem=12M@3060M\0" \ - "setusbupdate=setenv interface usb; setenv drive 1; " \ - "load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img " \ - "&& source ${kernel_addr_r}\0" \ - "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ + "setusbupdate=setenv interface usb; setenv drive 0; " \ + "load ${interface} ${drive}:1 ${kernel_addr_r} " \ + "flash_blk.img\0" \ + "setupdate=run setsdupdate || run setusbupdate || run setethupdate &&" \ + " source ${loadaddr}\0" \ USB_BOOTCMD \ "vidargs=video=tegrafb0:640x480-16@60 fbcon=map:1\0" |