Merge tag 'u-boot-rockchip-20200531' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / common / spl / spl_ymodem.c

diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index 25226e9a33565d0c1d14076e187a38b63094d664..284512478f1be52cf9119b18cf2fe0f73ed64043 100644 (file)
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -9,6 +9,9 @@
  * Matt Porter <mporter@ti.com>
  */
 #include <common.h>
+#include <gzip.h>
+#include <image.h>
+#include <log.h>
 #include <spl.h>
 #include <xyzModem.h>
 #include <asm/u-boot.h>
@@ -36,27 +39,32 @@ static int getcymodem(void) {
 static ulong ymodem_read_fit(struct spl_load_info *load, ulong offset,
                             ulong size, void *addr)
 {
-       int res, err;
+       int res, err, buf_offset;
        struct ymodem_fit_info *info = load->priv;
        char *buf = info->buf;
 
        while (info->image_read < offset) {
                res = xyzModem_stream_read(buf, BUF_SIZE, &err);
                if (res <= 0)
-                       return res;
+                       break;
+
                info->image_read += res;
        }
 
        if (info->image_read > offset) {
                res = info->image_read - offset;
-               memcpy(addr, &buf[BUF_SIZE - res], res);
+               if (info->image_read % BUF_SIZE)
+                       buf_offset = (info->image_read % BUF_SIZE);
+               else
+                       buf_offset = BUF_SIZE;
+               memcpy(addr, &buf[buf_offset - res], res);
                addr = addr + res;
        }
 
        while (info->image_read < offset + size) {
                res = xyzModem_stream_read(buf, BUF_SIZE, &err);
                if (res <= 0)
-                       return res;
+                       break;
 
                memcpy(addr, buf, res);
                info->image_read += res;
@@ -66,8 +74,8 @@ static ulong ymodem_read_fit(struct spl_load_info *load, ulong offset,
        return size;
 }
 
-static int spl_ymodem_load_image(struct spl_image_info *spl_image,
-                                struct spl_boot_device *bootdev)
+int spl_ymodem_load_image(struct spl_image_info *spl_image,
+                         struct spl_boot_device *bootdev)
 {
        ulong size = 0;
        int err;
@@ -89,7 +97,25 @@ static int spl_ymodem_load_image(struct spl_image_info *spl_image,
        if (res <= 0)
                goto end_stream;
 
-       if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
+       if (IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL) &&
+           image_get_magic((struct image_header *)buf) == FDT_MAGIC) {
+               addr = CONFIG_SYS_LOAD_ADDR;
+               ih = (struct image_header *)addr;
+
+               memcpy((void *)addr, buf, res);
+               size += res;
+               addr += res;
+
+               while ((res = xyzModem_stream_read(buf, BUF_SIZE, &err)) > 0) {
+                       memcpy((void *)addr, buf, res);
+                       size += res;
+                       addr += res;
+               }
+
+               ret = spl_parse_image_header(spl_image, ih);
+               if (ret)
+                       return ret;
+       } else if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
            image_get_magic((struct image_header *)buf) == FDT_MAGIC) {
                struct spl_load_info load;
                struct ymodem_fit_info info;