[PATCH v3 16/23] ARM: link ELF image into PBL

[Ahmad Fatoum]

Hi,

On 1/8/26 4:50 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.
> 
> Reviewed-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
> Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
> ---
>  arch/arm/Kconfig          |  1 +
>  arch/arm/cpu/start.c      | 13 ++++---------
>  arch/arm/cpu/uncompress.c | 26 +++++++++++++++++++-------
>  3 files changed, 24 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 5123e9b1402c56db94df6a7a33ae993c61d51fbc..65856977ab41298be36b78c64de857570d575744 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -18,6 +18,7 @@ config ARM
>  	select HW_HAS_PCI
>  	select ARCH_HAS_DMA_WRITE_COMBINE
>  	select HAVE_EFI_LOADER if MMU # for payload unaligned accesses
> +	select PBL_IMAGE_ELF
>  	default y
>  
>  config ARCH_LINUX_NAME
> diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
> index f7d4507e71588ba5e241b24b952d55e2a4b0f794..2498bdb894c261f587af6542ea4574c497a6edc0 100644
> --- a/arch/arm/cpu/start.c
> +++ b/arch/arm/cpu/start.c
> @@ -127,8 +127,9 @@ static int barebox_memory_areas_init(void)
>  }
>  device_initcall(barebox_memory_areas_init);
>  
> -__noreturn __prereloc void barebox_non_pbl_start(unsigned long membase,
> -		unsigned long memsize, struct handoff_data *hd)
> +__noreturn void barebox_non_pbl_start(unsigned long membase,
> +				      unsigned long memsize,
> +				      struct handoff_data *hd)
>  {
>  	unsigned long endmem = membase + memsize;
>  	unsigned long malloc_start, malloc_end;
> @@ -139,12 +140,6 @@ __noreturn __prereloc void barebox_non_pbl_start(unsigned long membase,
>  	if (IS_ENABLED(CONFIG_CPU_V7))
>  		armv7_hyp_install();
>  
> -	relocate_to_adr(barebox_base);
> -
> -	setup_c();
> -
> -	barrier();
> -
>  	pbl_barebox_break();
>  
>  	pr_debug("memory at 0x%08lx, size 0x%08lx\n", membase, memsize);
> @@ -200,7 +195,7 @@ void start(unsigned long membase, unsigned long memsize, struct handoff_data *hd
>   * First function in the uncompressed image. We get here from
>   * the pbl. The stack already has been set up by the pbl.
>   */
> -void NAKED __prereloc __section(.text_entry) start(unsigned long membase,
> +void __section(.text_entry) start(unsigned long membase,
>  		unsigned long memsize, struct handoff_data *hd)

Just squash the last patch into this one?

> +	ret = elf_load_inplace(&elf);
> +	if (ret)
> +		panic("Failed to relocate ELF: %d\n", ret);
> +
> +	pr_debug("ELF entry point: 0x%llx\n", elf.entry);

Drop this line as there is already an equivalent print further down.

Cheers,
Ahmad


-- 
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 |