merged tx6dl-devel into denx master branch

[karo-tx-uboot.git] / common / spl / spl_ymodem.c

diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index 0f1e9970798b830f0d5a51c58c7c1860755732fb..10e69427df08117bf4ac5f28eaf2f2961afefce9 100644 (file)
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <spl.h>
 #include <xyzModem.h>
+#include <watchdog.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
 
@@ -34,22 +35,23 @@ void spl_ymodem_load_image(void)
        ulong store_addr = ~0;
        ulong addr = 0;
 
+loop:
        info.mode = xyzModem_ymodem;
        ret = xyzModem_stream_open(&info, &err);
-
-       if (!ret) {
-               while ((res =
-                       xyzModem_stream_read(buf, BUF_SIZE, &err)) > 0) {
+       if (ret == 0) {
+               while ((res = xyzModem_stream_read(buf, BUF_SIZE, &err)) > 0) {
+                       WATCHDOG_RESET();
                        if (addr == 0)
                                spl_parse_image_header((struct image_header *)buf);
                        store_addr = addr + spl_image.load_addr;
                        size += res;
                        addr += res;
-                       memcpy((char *)(store_addr), buf, res);
+                       memcpy((char *)store_addr, buf, res);
                }
        } else {
-               printf("spl: ymodem err - %s\n", xyzModem_error(err));
-               hang();
+               WATCHDOG_RESET();
+               printf("Retrying...\n");
+               goto loop;
        }
 
        xyzModem_stream_close(&err);