Merge branch 'master' of git://git.denx.de/u-boot

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

diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index 5402301c7832e728c5a228f0dfb5b192e7f45208..8500ee8ba5d917ee95e93bb6a08e0a47e7869bfe 100644 (file)
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -6,15 +7,13 @@
  * Texas Instruments, <www.ti.com>
  *
  * Matt Porter <mporter@ti.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
+#include <gzip.h>
 #include <spl.h>
 #include <xyzModem.h>
 #include <asm/u-boot.h>
-#include <asm/utils.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 
 #define BUF_SIZE 1024
 
@@ -38,27 +37,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;
@@ -68,14 +72,16 @@ static ulong ymodem_read_fit(struct spl_load_info *load, ulong offset,
        return size;
 }
 
-int spl_ymodem_load_image(void)
+int spl_ymodem_load_image(struct spl_image_info *spl_image,
+                         struct spl_boot_device *bootdev)
 {
-       int size = 0;
+       ulong size = 0;
        int err;
        int res;
        int ret;
        connection_info_t info;
        char buf[BUF_SIZE];
+       struct image_header *ih = NULL;
        ulong addr = 0;
 
        info.mode = xyzModem_ymodem;
@@ -89,7 +95,25 @@ int spl_ymodem_load_image(void)
        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;
@@ -102,18 +126,24 @@ int spl_ymodem_load_image(void)
                info.buf = buf;
                info.image_read = BUF_SIZE;
                load.read = ymodem_read_fit;
-               ret =  spl_load_simple_fit(&load, 0, (void *)buf);
+               ret = spl_load_simple_fit(spl_image, &load, 0, (void *)buf);
                size = info.image_read;
 
                while ((res = xyzModem_stream_read(buf, BUF_SIZE, &err)) > 0)
                        size += res;
        } else {
-               spl_parse_image_header((struct image_header *)buf);
-               ret = spl_parse_image_header((struct image_header *)buf);
+               ih = (struct image_header *)buf;
+               ret = spl_parse_image_header(spl_image, ih);
                if (ret)
-                       return ret;
-               addr = spl_image.load_addr;
+                       goto end_stream;
+#ifdef CONFIG_SPL_GZIP
+               if (ih->ih_comp == IH_COMP_GZIP)
+                       addr = CONFIG_SYS_LOAD_ADDR;
+               else
+#endif
+                       addr = spl_image->load_addr;
                memcpy((void *)addr, buf, res);
+               ih = (struct image_header *)addr;
                size += res;
                addr += res;
 
@@ -128,6 +158,22 @@ end_stream:
        xyzModem_stream_close(&err);
        xyzModem_stream_terminate(false, &getcymodem);
 
-       printf("Loaded %d bytes\n", size);
-       return 0;
+       printf("Loaded %lu bytes\n", size);
+
+#ifdef CONFIG_SPL_GZIP
+       if (!(IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
+             image_get_magic((struct image_header *)buf) == FDT_MAGIC) &&
+           (ih->ih_comp == IH_COMP_GZIP)) {
+               if (gunzip((void *)(spl_image->load_addr + sizeof(*ih)),
+                          CONFIG_SYS_BOOTM_LEN,
+                          (void *)(CONFIG_SYS_LOAD_ADDR + sizeof(*ih)),
+                          &size)) {
+                       puts("Uncompressing error\n");
+                       return -EIO;
+               }
+       }
+#endif
+
+       return ret;
 }
+SPL_LOAD_IMAGE_METHOD("UART", 0, BOOT_DEVICE_UART, spl_ymodem_load_image);