Re: [PATCH v2 6/6] mips: lib: bootm: use new data->elf member

["Clément Leger" <cleger@kalray.eu>]

Hi,

----- On 23 Apr, 2020, at 10:17, Clément Leger cleger@kalray.eu wrote:

> Now that the elf file is loaded by the bootm core, use this field
> directly instead of manually loading the elf file.
> 
> Signed-off-by: Clement Leger <cleger@kalray.eu>
> ---
> arch/mips/lib/bootm.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
> index 5bb09cc2d..1e5fdd4ae 100644
> --- a/arch/mips/lib/bootm.c
> +++ b/arch/mips/lib/bootm.c
> @@ -46,18 +46,10 @@ 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;
> +	struct elf_image *elf = data->elf;
> +	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);
> @@ -82,7 +74,6 @@ static int do_bootm_elf(struct image_data *data)
> bootm_elf_done:
> 	elf_release_image(elf);
> 	free(fdt);
> -	free(buf);
> 
> 	return ret;
> }

I'm sorry, This patch is a leftover from my previous serie and as such should be dropped.
The other mips patch cleans the MIPS elf loading code more thoroughly.

> --
> 2.17.1

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