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 6/8] common: elf: add elf_open, elf_close and elf_load
Date: Fri, 12 Jun 2020 09:10:34 +0200	[thread overview]
Message-ID: <20200612071036.27864-7-cleger@kalray.eu> (raw)
In-Reply-To: <20200612071036.27864-1-cleger@kalray.eu>

In order to integrate elf loading into bootm command, split elf opening
from elf loading.

Signed-off-by: Clement Leger <cleger@kalray.eu>
---
 arch/mips/lib/bootm.c |  8 ++++++--
 common/elf.c          | 20 +++++++-------------
 include/elf.h         |  5 +++--
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index b07884ae0..8e16994b6 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -50,10 +50,14 @@ static int do_bootm_elf(struct image_data *data)
 	void *fdt;
 	int ret = 0;
 
-	elf = elf_load_image(data->os_file);
+	elf = elf_open(data->os_file);
 	if (IS_ERR(elf))
 		return PTR_ERR(elf);
 
+	ret = elf_load(elf);
+	if (ret)
+		goto bootm_elf_done;
+
 	fdt = bootm_get_devicetree(data);
 	if (IS_ERR(fdt)) {
 		ret = PTR_ERR(fdt);
@@ -76,7 +80,7 @@ static int do_bootm_elf(struct image_data *data)
 	ret = -EINVAL;
 
 bootm_elf_done:
-	elf_release_image(elf);
+	elf_close(elf);
 	free(fdt);
 
 	return ret;
diff --git a/common/elf.c b/common/elf.c
index 1bcaafea7..af22be37e 100644
--- a/common/elf.c
+++ b/common/elf.c
@@ -285,23 +285,17 @@ err_free_elf:
 	return ERR_PTR(ret);
 }
 
-struct elf_image *elf_load_image(const char *filename)
+struct elf_image *elf_open(const char *filename)
 {
-	int ret;
-	struct elf_image *elf;
-
-	elf = elf_check_init(filename);
-	if (IS_ERR(elf))
-		return elf;
-
-	ret = load_elf_image_segments(elf);
-	if (ret)
-		return ERR_PTR(ret);
+	return elf_check_init(filename);
+}
 
-	return elf;
+int elf_load(struct elf_image *elf)
+{
+	return load_elf_image_segments(elf);
 }
 
-void elf_release_image(struct elf_image *elf)
+void elf_close(struct elf_image *elf)
 {
 	elf_release_regions(elf);
 
diff --git a/include/elf.h b/include/elf.h
index f1a80a20a..7970fd2c9 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -414,8 +414,9 @@ static inline size_t elf_get_mem_size(struct elf_image *elf)
 	return elf->high_addr - elf->low_addr;
 }
 
-struct elf_image *elf_load_image(const char *filename);
-void elf_release_image(struct elf_image *elf);
+struct elf_image *elf_open(const char *filename);
+void elf_close(struct elf_image *elf);
+int elf_load(struct elf_image *elf);
 
 #define ELF_GET_FIELD(__s, __field, __type) \
 static inline __type elf_##__s##_##__field(struct elf_image *elf, void *arg) { \
-- 
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 ` Clement Leger [this message]
2020-06-12  7:10 ` [PATCH v6 7/8] common: bootm: add support for elf file loading Clement Leger
2020-06-12  7:10 ` [PATCH v6 8/8] mips: lib: bootm: use bootm elf loading capabilities Clement Leger
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-7-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