[PATCH 17/19] riscv: link ELF image into PBL

[Ahmad Fatoum]

Hi,

On 1/5/26 12:26 PM, Sascha Hauer wrote:
> Instead of linking the raw binary barebox proper image into the PBL link
> the ELF image into the PBL. With this barebox proper starts with a properly
> linked and fully initialized C environment, so the calls to
> relocate_to_adr() and setup_c() can be removed from barebox proper.
> 
> Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
> ---
>  arch/riscv/Kconfig           |  2 ++
>  arch/riscv/boot/start.c      |  4 ----
>  arch/riscv/boot/uncompress.c | 16 +++++++++++++++-
>  3 files changed, 17 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index 96d013d8514ac12de5c34a426262d85f8cf021b9..f8c8b38ed6d7fdae48669e6d7b737f695f1c4cc9 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -17,6 +17,8 @@ config RISCV
>  	select HAS_KALLSYMS
>  	select RISCV_TIMER if RISCV_SBI
>  	select HW_HAS_PCI
> +	select ELF

IMO should be selected by PBL_IMAGE_ELF instead.

> +	select PBL_IMAGE_ELF
>  	select HAVE_ARCH_BOARD_GENERIC_DT
>  	select HAVE_ARCH_BOOTM_OFTREE
>  
> diff --git a/arch/riscv/boot/start.c b/arch/riscv/boot/start.c
> index 5091340c8a374fc360ab732ba01ec8516e82a83d..874f4e72ae46fe7435c9defedceaf5b4e9662b55 100644
> --- a/arch/riscv/boot/start.c
> +++ b/arch/riscv/boot/start.c
> @@ -123,10 +123,6 @@ void barebox_non_pbl_start(unsigned long membase, unsigned long memsize,
>  	unsigned long barebox_size = barebox_image_size + MAX_BSS_SIZE;
>  	unsigned long barebox_base = riscv_mem_barebox_image(membase, endmem, barebox_size);
>  
> -	relocate_to_current_adr();
> -
> -	setup_c();
> -
>  	barrier();

barrier() can go away as well.

>  
>  	irq_init_vector(riscv_mode());
> diff --git a/arch/riscv/boot/uncompress.c b/arch/riscv/boot/uncompress.c
> index 84142acf9c66fe1fcceb6ae63d15ac078ccddee7..dc0d1fd5d41a88acea8717a7f5fcdb8da3298663 100644
> --- a/arch/riscv/boot/uncompress.c
> +++ b/arch/riscv/boot/uncompress.c
> @@ -32,6 +32,8 @@ void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize,
>  	unsigned long barebox_base;
>  	void *pg_start, *pg_end;
>  	unsigned long pc = get_pc();
> +	struct elf_image elf;
> +	int ret;
>  
>  	irq_init_vector(riscv_mode());
>  
> @@ -68,7 +70,19 @@ void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize,
>  
>  	sync_caches_for_execution();
>  
> -	barebox = (void *)barebox_base;
> +	ret = elf_open_binary_into(&elf, (void *)barebox_base);
> +	if (ret) {
> +		pr_err("Failed to open ELF binary: %d\n", ret);
> +		hang();

panic()

> +	}
> +
> +	ret = elf_load_inplace(&elf);
> +	if (ret) {
> +		pr_err("Failed to relocate ELF: %d\n", ret);
> +		hang();
> +	}

panic()

Cheers,
Ahmad

> +
> +	barebox = (void *)elf.entry;
>  
>  	pr_debug("jumping to uncompressed image at 0x%p. dtb=0x%p\n", barebox, fdt);
>  
> 


-- 
Pengutronix e.K.                  |                             |
Steuerwalder Str. 21              | http://www.pengutronix.de/  |
31137 Hildesheim, Germany         | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |