On 4/25/19 9:56 PM, Atish Patra wrote: > Add gz parsing logic so that booti can parse both Image > and Image.gz. > > Signed-off-by: Atish Patra <atish.pa...@wdc.com> > --- > arch/riscv/lib/image.c | 28 +++++++++++++++++++++++++++- > 1 file changed, 27 insertions(+), 1 deletion(-) > > diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c > index e8802007c446..73ebd0da3885 100644 > --- a/arch/riscv/lib/image.c > +++ b/arch/riscv/lib/image.c > @@ -9,6 +9,8 @@ > #include <common.h> > #include <mapmem.h> > #include <errno.h> > +#include <bootm.h> > +#include <malloc.h> > #include <linux/sizes.h> > #include <linux/stddef.h> > > @@ -16,6 +18,8 @@ DECLARE_GLOBAL_DATA_PTR; > > /* ASCII version of "RISCV" defined in Linux kernel */ > #define LINUX_RISCV_IMAGE_MAGIC 0x5643534952 > +#define GZ_HEADER_0 0x1f > +#define GZ_HEADER_1 0x8b > > struct linux_image_h { > uint32_t code0; /* Executable code */ > @@ -32,9 +36,31 @@ int booti_setup(ulong image, ulong *relocated_addr, ulong > *size, > bool force_reloc) > { > struct linux_image_h *lhdr; > + uint8_t *temp; > + void *dest; > + ulong dest_end; > + int ret; > + /* TODO: Is there a way to figure out length of compressed Image.gz ? > + * Otherwise, set it to SYS_BOOTM_LEN which should be sufficient. > + */
Presumably this is a RFC patch then ? What happens if you have two (or more) gzip-ed files back-to-back ? Wouldn't you then decompress both ? That might lead to all kinds of problems. > + int len = CONFIG_SYS_BOOTM_LEN; > + > + temp = (uint8_t *)map_sysmem(image, 0); Is the type cast really needed ? > - lhdr = (struct linux_image_h *)map_sysmem(image, 0); > + if (*(temp) == GZ_HEADER_0 && *(temp+1) == GZ_HEADER_1) { Wrap the image in some fitImage or so contained, mark the image as gzip compressed there and all this goes away. > + /* Need a temporary location to copy the uncompressed image */ > + dest = (void *)map_sysmem(image + 8 * CONFIG_SYS_BOOTM_LEN, 0); > + ret = bootm_decomp_image(IH_COMP_GZIP, 0, image, IH_TYPE_KERNEL, > + dest, (void *)image, len, > + CONFIG_SYS_BOOTM_LEN, &dest_end); > + if (ret) > + return ret; > + /* dest_end contains the uncompressed Image size */ > + memmove((void *) image, dest, dest_end); > + unmap_sysmem(dest); > + } > > + lhdr = (struct linux_image_h *)temp; > if (lhdr->magic != LINUX_RISCV_IMAGE_MAGIC) { > puts("Bad Linux RISCV Image magic!\n"); > return -EINVAL; > -- Best regards, Marek Vasut _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot