mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Clement Leger <cleger@kalray.eu>
To: Sascha Hauer <s.hauer@pengutronix.de>, barebox@lists.infradead.org
Cc: Clement Leger <cleger@kalray.eu>,
	Oleksij Rempel <linux@rempel-privat.de>
Subject: [PATCH v6 8/8] mips: lib: bootm: use bootm elf loading capabilities
Date: Fri, 12 Jun 2020 09:10:36 +0200	[thread overview]
Message-ID: <20200612071036.27864-9-cleger@kalray.eu> (raw)
In-Reply-To: <20200612071036.27864-1-cleger@kalray.eu>

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 and
bootm_load_os can be used.

Signed-off-by: Clement Leger <cleger@kalray.eu>
---
 arch/mips/lib/bootm.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index 8e16994b6..6c56202ea 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -46,41 +46,35 @@ 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;
 	int ret = 0;
 
-	elf = elf_open(data->os_file);
-	if (IS_ERR(elf))
-		return PTR_ERR(elf);
-
-	ret = elf_load(elf);
+	ret = bootm_load_os(data, data->os_address);
 	if (ret)
-		goto bootm_elf_done;
+		return ret;
 
 	fdt = bootm_get_devicetree(data);
 	if (IS_ERR(fdt)) {
 		ret = PTR_ERR(fdt);
-		goto bootm_elf_done;
+		goto bootm_free_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_close(elf);
+bootm_free_fdt:
 	free(fdt);
 
 	return ret;
-- 
2.17.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2020-06-12  7:11 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-12  7:10 [PATCH v6 0/8] elf: add better bootm support Clement Leger
2020-06-12  7:10 ` [PATCH v6 1/8] common: elf: add computation of elf boundaries Clement Leger
2020-06-12  7:10 ` [PATCH v6 2/8] common: elf: fix warning on 32 bits architectures Clement Leger
2020-06-12  7:10 ` [PATCH v6 3/8] common: elf: use calloc instead of xzalloc Clement Leger
2020-06-12  7:10 ` [PATCH v6 4/8] common: elf: check number of elf program headers Clement Leger
2020-06-12  7:10 ` [PATCH v6 5/8] common: elf: load elf directly from file Clement Leger
2020-06-12  7:10 ` [PATCH v6 6/8] common: elf: add elf_open, elf_close and elf_load Clement Leger
2020-06-12  7:10 ` [PATCH v6 7/8] common: bootm: add support for elf file loading Clement Leger
2020-06-12  7:10 ` Clement Leger [this message]
2020-06-12  7:41 ` [PATCH v6 0/8] elf: add better bootm support Oleksij Rempel
2020-06-12  7:44   ` Clément Leger
2020-06-15 14:15 ` Sascha Hauer

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=20200612071036.27864-9-cleger@kalray.eu \
    --to=cleger@kalray.eu \
    --cc=barebox@lists.infradead.org \
    --cc=linux@rempel-privat.de \
    --cc=s.hauer@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