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

[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..ff8085b795e61b82544d6c8eda3cd1ce6d64d366 100644 (file)
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -68,7 +68,8 @@ static ulong ymodem_read_fit(struct spl_load_info *load, ulong offset,
        return size;
 }
 
-int spl_ymodem_load_image(void)
+static int spl_ymodem_load_image(struct spl_image_info *spl_image,
+                                struct spl_boot_device *bootdev)
 {
        int size = 0;
        int err;
@@ -102,17 +103,17 @@ 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);
+               ret = spl_parse_image_header(spl_image,
+                                            (struct image_header *)buf);
                if (ret)
                        return ret;
-               addr = spl_image.load_addr;
+               addr = spl_image->load_addr;
                memcpy((void *)addr, buf, res);
                size += res;
                addr += res;
@@ -131,3 +132,4 @@ end_stream:
        printf("Loaded %d bytes\n", size);
        return 0;
 }
+SPL_LOAD_IMAGE_METHOD("UART", 0, BOOT_DEVICE_UART, spl_ymodem_load_image);