From: Clement Leger <cleger@kalray.eu>
To: Sascha Hauer <s.hauer@pengutronix.de>, barebox@lists.infradead.org
Cc: Clement Leger <cleger@kalray.eu>
Subject: [PATCH v3 7/7] common: elf: remove elf_load_image/elf_release_image
Date: Tue, 28 Apr 2020 09:51:00 +0200 [thread overview]
Message-ID: <20200428075100.17565-8-cleger@kalray.eu> (raw)
In-Reply-To: <20200428075100.17565-1-cleger@kalray.eu>
Since elf loading has been integrated in bootm using elf_open/elf_close,
remove these two functions which are now unused.
Signed-off-by: Clement Leger <cleger@kalray.eu>
---
common/elf.c | 39 +++++----------------------------------
include/elf.h | 3 ---
2 files changed, 5 insertions(+), 37 deletions(-)
diff --git a/common/elf.c b/common/elf.c
index 9edd2742f..e69f6928b 100644
--- a/common/elf.c
+++ b/common/elf.c
@@ -96,8 +96,8 @@ static int load_elf_image_phdr(struct elf_image *elf)
void *src = buf + elf_phdr_p_offset(elf, phdr);
ret = load_elf_phdr_segment(elf, src, phdr);
- /* in case of error elf_load_image() caller should clean up and
- * call elf_release_image() */
+ /* in case of error elf_load() caller should clean up and
+ * call elf_release_regions() */
if (ret)
return ret;
@@ -133,37 +133,6 @@ static int elf_check_init(struct elf_image *elf, void *buf)
return elf_check_image(elf);
}
-struct elf_image *elf_load_image(void *buf)
-{
- struct elf_image *elf;
- int ret;
-
- elf = xzalloc(sizeof(*elf));
-
- INIT_LIST_HEAD(&elf->list);
-
- ret = elf_check_init(elf, buf);
- if (ret) {
- free(elf);
- return ERR_PTR(ret);
- }
-
- ret = load_elf_image_phdr(elf);
- if (ret) {
- elf_release_image(elf);
- return ERR_PTR(ret);
- }
-
- return elf;
-}
-
-void elf_release_image(struct elf_image *elf)
-{
- elf_release_regions(elf);
-
- free(elf);
-}
-
int elf_load(struct elf_image *elf)
{
int ret;
@@ -248,5 +217,7 @@ err_close_fd:
void elf_close(struct elf_image *elf)
{
free(elf->buf);
- elf_release_image(elf);
+ elf_release_regions(elf);
+
+ free(elf);
}
diff --git a/include/elf.h b/include/elf.h
index b36b917e5..75ee0c975 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -413,9 +413,6 @@ 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(void *buf);
-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);
--
2.17.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2020-04-28 7:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 7:50 [PATCH v3 0/7] elf: add better bootm support Clement Leger
2020-04-28 7:50 ` [PATCH v3 1/7] common: elf: add computation of elf boundaries Clement Leger
2020-04-28 7:50 ` [PATCH v3 2/7] common: elf: fix warning on 32 bits architectures Clement Leger
2020-04-28 7:50 ` [PATCH v3 3/7] common: elf: split init to be reused from other function Clement Leger
2020-04-28 7:50 ` [PATCH v3 4/7] common: elf: add elf_open, elf_close and elf_load Clement Leger
2020-04-28 7:50 ` [PATCH v3 5/7] common: bootm: add support for elf file loading Clement Leger
2020-04-28 7:50 ` [PATCH v3 6/7] mips: lib: bootm: use bootm elf loading capabilities Clement Leger
2020-04-28 7:51 ` Clement Leger [this message]
2020-04-29 8:34 ` [PATCH v3 0/7] elf: add better bootm support Oleksij Rempel
2020-04-29 8:55 ` Clément Leger
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=20200428075100.17565-8-cleger@kalray.eu \
--to=cleger@kalray.eu \
--cc=barebox@lists.infradead.org \
--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