From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from zimbra2.kalray.eu ([92.103.151.219]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jX6Qg-0007ww-Lp for barebox@lists.infradead.org; Fri, 08 May 2020 17:04:56 +0000 From: Clement Leger Date: Fri, 8 May 2020 19:04:10 +0200 Message-Id: <20200508170411.26841-7-cleger@kalray.eu> In-Reply-To: <20200508170411.26841-1-cleger@kalray.eu> References: <20200508170411.26841-1-cleger@kalray.eu> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH v4 6/7] mips: lib: bootm: use bootm elf loading capabilities To: Sascha Hauer , barebox@lists.infradead.org Cc: Clement Leger , Oleksij Rempel 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 --- arch/mips/lib/bootm.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 5bb09cc2d..48f0d83cf 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -46,43 +46,34 @@ 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; - int ret = 0; + void *fdt; + int ret; - buf = read_file(data->os_file, NULL); - if (!buf) - return -EINVAL; - - elf = elf_load_image(buf); - if (IS_ERR(elf)) - return PTR_ERR(elf); + ret = bootm_load_os(data, data->os_address); + if (ret) + return ret; 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 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox