diff options
Diffstat (limited to 'common/spl/spl_legacy.c')
| -rw-r--r-- | common/spl/spl_legacy.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c index b3624dfbb7..4c7f44687e 100644 --- a/common/spl/spl_legacy.c +++ b/common/spl/spl_legacy.c @@ -77,32 +77,29 @@ static inline int spl_image_get_comp(const struct legacy_img_hdr *hdr) int spl_load_legacy_img(struct spl_image_info *spl_image, struct spl_boot_device *bootdev, - struct spl_load_info *load, ulong header) + struct spl_load_info *load, ulong offset, + struct legacy_img_hdr *hdr) { __maybe_unused SizeT lzma_len; __maybe_unused void *src; - struct legacy_img_hdr hdr; ulong dataptr; int ret; - /* Read header into local struct */ - load->read(load, header, sizeof(hdr), &hdr); - /* * If the payload is compressed, the decompressed data should be * directly write to its load address. */ - if (spl_image_get_comp(&hdr) != IH_COMP_NONE) + if (spl_image_get_comp(hdr) != IH_COMP_NONE) spl_image->flags |= SPL_COPY_PAYLOAD_ONLY; - ret = spl_parse_image_header(spl_image, bootdev, &hdr); + ret = spl_parse_image_header(spl_image, bootdev, hdr); if (ret) return ret; /* Read image */ - switch (spl_image_get_comp(&hdr)) { + switch (spl_image_get_comp(hdr)) { case IH_COMP_NONE: - dataptr = header; + dataptr = offset; /* * Image header will be skipped only if SPL_COPY_PAYLOAD_ONLY @@ -119,7 +116,7 @@ int spl_load_legacy_img(struct spl_image_info *spl_image, lzma_len = LZMA_LEN; /* dataptr points to compressed payload */ - dataptr = header + sizeof(hdr); + dataptr = offset + sizeof(hdr); debug("LZMA: Decompressing %08lx to %08lx\n", dataptr, spl_image->load_addr); @@ -143,7 +140,7 @@ int spl_load_legacy_img(struct spl_image_info *spl_image, default: debug("Compression method %s is not supported\n", - genimg_get_comp_short_name(image_get_comp(&hdr))); + genimg_get_comp_short_name(image_get_comp(hdr))); return -EINVAL; } |