Hi Lucas,
On Tue, May 25, 2021 at 08:37:33PM +0200, Lucas Stach wrote:
> ARM64 does not have a self extracting image format, but relies on the image
> being externally compressed with one of the standard compression algorithms.
>
> Add support for decompressing the bootm OS image. It is added in common
> code as it may also be useful for other images/architectures.
>
> Signed-off-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
> ---
> common/bootm.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 92 insertions(+)
>
> diff --git a/common/bootm.c b/common/bootm.c
> index 092116beb94a..2bfb5cb01593 100644
> --- a/common/bootm.c
> +++ b/common/bootm.c
> @@ -12,6 +12,7 @@
> #include <environment.h>
> #include <linux/stat.h>
> #include <magicvar.h>
> +#include <uncompress.h>
>
> static LIST_HEAD(handler_list);
>
> @@ -808,6 +809,85 @@ err_out:
> return ret;
> }
>
> +static int do_bootm_compressed(struct image_data *img_data)
> +{
> + struct bootm_data bootm_data = {
> + .oftree_file = img_data->oftree_file,
> + .initrd_file = img_data->initrd_file,
> + .tee_file = img_data->tee_file,
> + .verbose = img_data->verbose,
> + .verify = img_data->verify,
> + .force = img_data->force,
> + .dryrun = img_data->dryrun,
> + .initrd_address = img_data->initrd_address,
> + .os_address = img_data->os_address,
> + .os_entry = img_data->os_entry,
> + };
> + int from, to, ret;
> + char *dstpath;
> +
> + from = open(img_data->os_file, O_RDONLY);
> + if (from < 0)
> + return -ENODEV;
> +
> + dstpath = make_temp("bootm-compressed");
> + if (!dstpath) {
> + ret = -ENOMEM;
> + goto fail_from;
> + }
> +
> + to = open(dstpath, O_CREAT | O_WRONLY);
> + if (to < 0) {
> + ret = -ENODEV;
> + goto fail_make_temp;
> + }
> +
> + ret = uncompress_fd_to_fd(from, to, uncompress_err_stdout);
> + if (ret)
> + goto fail_to;
> +
> + bootm_data.os_file = dstpath;
> + return bootm_boot(&bootm_data);
ret = bootm_boot();
and fall through to free the resources please. Also an unlink(dtspath)
is missing.
Sascha
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
