From: Sascha Hauer <s.hauer@pengutronix.de>
To: Clement Leger <cleger@kalray.eu>
Cc: barebox@lists.infradead.org, Oleksij Rempel <ore@pengutronix.de>
Subject: Re: [PATCH v2 6/6] mips: lib: bootm: use bootm elf loading capabilities
Date: Tue, 28 Apr 2020 08:41:47 +0200 [thread overview]
Message-ID: <20200428064147.GQ5877@pengutronix.de> (raw)
In-Reply-To: <20200423081712.4022-7-cleger@kalray.eu>
Antony, Oleksij,
Are you able to test this?
Sascha
On Thu, Apr 23, 2020 at 10:17:11AM +0200, Clement Leger wrote:
> Now that the elf file is loaded by the bootm core, there is no need for
> elf pointer anymore. Thus all elf related fields can be removed.
>
> Signed-off-by: Clement Leger <cleger@kalray.eu>
> ---
> arch/mips/lib/bootm.c | 27 +++++++--------------------
> 1 file changed, 7 insertions(+), 20 deletions(-)
>
> diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
> index 5bb09cc2d..c53a679c5 100644
> --- a/arch/mips/lib/bootm.c
> +++ b/arch/mips/lib/bootm.c
> @@ -46,43 +46,30 @@ static struct binfmt_hook binfmt_barebox_hook = {
> static int do_bootm_elf(struct image_data *data)
> {
> void (*entry)(int, void *);
> - struct elf_image *elf;
> - void *fdt, *buf;
> + void *fdt;
> int ret = 0;
>
> - buf = read_file(data->os_file, NULL);
> - if (!buf)
> - return -EINVAL;
> -
> - elf = elf_load_image(buf);
> - if (IS_ERR(elf))
> - return PTR_ERR(elf);
> -
> fdt = bootm_get_devicetree(data);
> - if (IS_ERR(fdt)) {
> - ret = PTR_ERR(fdt);
> - goto bootm_elf_done;
> - }
> + if (IS_ERR(fdt))
> + return PTR_ERR(fdt);
>
> pr_info("Starting application at 0x%08lx, dts 0x%08lx...\n",
> - phys_to_virt(elf->entry), data->of_root_node);
> + phys_to_virt(data->os_address), data->of_root_node);
>
> if (data->dryrun)
> - goto bootm_elf_done;
> + goto bootm_free_fdt;
>
> shutdown_barebox();
>
> - entry = (void *) (unsigned long) elf->entry;
> + entry = (void *) (unsigned long) data->os_address;
>
> entry(-2, phys_to_virt((unsigned long)fdt));
>
> pr_err("ELF application terminated\n");
> ret = -EINVAL;
>
> -bootm_elf_done:
> - elf_release_image(elf);
> +bootm_free_fdt:
> free(fdt);
> - free(buf);
>
> return ret;
> }
> --
> 2.17.1
>
>
--
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@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2020-04-28 6:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 8:17 [PATCH v2 0/6] elf: add better bootm support Clement Leger
2020-04-23 8:17 ` [PATCH v2 1/6] common: elf: add computation of elf boundaries Clement Leger
2020-04-23 8:17 ` [PATCH v2 2/6] common: elf: fix warning on 32 bits architectures Clement Leger
2020-04-23 8:17 ` [PATCH v2 3/6] common: elf: split init to be reused from other function Clement Leger
2020-04-23 8:17 ` [PATCH v2 4/6] common: elf: add elf_open and elf_close Clement Leger
2020-04-28 6:39 ` Sascha Hauer
2020-04-28 7:38 ` Clément Leger
2020-04-23 8:17 ` [PATCH v2 5/6] common: bootm: add support for elf file loading Clement Leger
2020-04-23 8:17 ` [PATCH v2 6/6] mips: lib: bootm: use bootm elf loading capabilities Clement Leger
2020-04-28 6:41 ` Sascha Hauer [this message]
2020-04-23 8:17 ` [PATCH v2 6/6] mips: lib: bootm: use new data->elf member Clement Leger
2020-04-23 8:20 ` Clément Leger
2020-04-23 10:20 ` [PATCH v2 0/6] elf: add better bootm support Antony Pavlov
2020-04-23 11:06 ` Clément Leger
2020-04-28 12:40 ` Antony Pavlov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200428064147.GQ5877@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=cleger@kalray.eu \
--cc=ore@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox