apalis/colibri_t30: fix setupdate handling

Fix setupdate handling.

While at it also fix using asix_mac rather than igb_mac on Colibri T30.

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index a85ee7eabfd9ea8549cebc264f80511df2570589..a5fe80f70d0cfd2937de73eb20376f9cf8a4db41 100644 (file)
--- 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 9012b6d20cce39f058c2386f95342af2f65a6684..8818fa4902041f5b73a28552a413a7e827de40c0 100644 (file)
--- 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"