[PATCH v2 2/2] rockchip: Fix SPL link error for Radxa ROCK Pi 4

[Quentin Schulz]

Hi Naoki,

On 2/11/25 5:33 AM, FUKAUMI Naoki wrote:
> If CONFIG_EFI_CAPSULE_FIRMWARE_RAW, CONFIG_SPL_ENV_SUPPORT, and
> CONFIG_SPL_DFU are enabled, linking u-boot-spl will fail.
> 
>    LD      spl/u-boot-spl
> ld.bfd: drivers/dfu/dfu.o: in function `dfu_init_env_entities':
> /home/radxa/u-boot/drivers/dfu/dfu.c:173:(.text.dfu_init_env_entities+0x24): undefined reference to `set_dfu_alt_info'
> 
> Separate the EFI specific parts from board.c into efi.c.
> 

The issue here is not EFI, it's SPL_DFU. It's because set_dfu_alt_info 
is contained in board.o which is only ever compiled for U-Boot proper.

> Signed-off-by: FUKAUMI Naoki <naoki at radxa.com>
> ---
> Changes in v2:
> - Separate the EFI specific parts from board.c into efi.c
> ---
>   arch/arm/mach-rockchip/Makefile |   1 +
>   arch/arm/mach-rockchip/board.c  | 165 --------------------------
>   arch/arm/mach-rockchip/efi.c    | 201 ++++++++++++++++++++++++++++++++
>   3 files changed, 202 insertions(+), 165 deletions(-)
>   create mode 100644 arch/arm/mach-rockchip/efi.c
> 
> diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile
> index 5e7edc99cdc..cf66a507c8e 100644
> --- a/arch/arm/mach-rockchip/Makefile
> +++ b/arch/arm/mach-rockchip/Makefile
> @@ -26,6 +26,7 @@ obj-$(CONFIG_ROCKCHIP_COMMON_BOARD) += board.o
>   endif
>   
>   ifeq ($(CONFIG_TPL_BUILD),)
> +obj-$(CONFIG_ROCKCHIP_COMMON_BOARD) += efi.o

Please have a separate commit for moving the code into efi.c but keep 
compiling efi.o the same way it is done for board.o and then in the next 
commit move efi.o to SPL only.

If I'm not mistaken, you simply need to move get_mmc_desc and 
set_dfu_alt_info in a file that you'll compile only if 
$(CONFIG_$(XPL_)DFU) = y.

The "issue" here is that you need get_mmc_desc also for EFI, but nothing 
that cannot be fixed by adding some stuff to some header and removing 
the static keyword :)

Also I would assume we still want to compile EFI and DFU support in xPL 
phases, e.g. for using DFU in SPL to boot U-Boot proper?

[...]

> -__weak int rk_board_late_init(void)
> -{
> -	return 0;
> -}
> -
> -int board_late_init(void)
> -{
> -	setup_boot_mode();
> -
> -#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && IS_ENABLED(CONFIG_EFI_PARTITION)
> -	gpt_capsule_update_setup();
> -#endif
> -
> -	return rk_board_late_init();
> -}
> -

I don't think you should be moving board_late_init and 
rk_board_late_init to a different file, especially since this new file 
will not be compiled under the same rules as the current one. Therefore, 
we may now be missing board_late_init for some boards for example if I'm 
not mistaken.

>   int board_init(void)
>   {
>   	return 0;
> diff --git a/arch/arm/mach-rockchip/efi.c b/arch/arm/mach-rockchip/efi.c
> new file mode 100644
> index 00000000000..5173a7c1b4e
> --- /dev/null
> +++ b/arch/arm/mach-rockchip/efi.c
> @@ -0,0 +1,201 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * (C) Copyright 2019 Rockchip Electronics Co., Ltd.
> + *
> + * Copyright (C) 2019 Collabora Inc - https://www.collabora.com/
> + *      Rohan Garg <rohan.garg at collabora.com>
> + *
> + * Based on puma-rk3399.c:
> + *      (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
> + */
> +#include <config.h>
> +#include <clk.h>
> +#include <cpu_func.h>
> +#include <env.h>
> +#include <dm.h>
> +#include <dm/uclass-internal.h>
> +#include <efi_loader.h>
> +#include <fastboot.h>
> +#include <hash.h>
> +#include <init.h>
> +#include <log.h>
> +#include <mmc.h>
> +#include <dm/uclass-internal.h>
> +#include <misc.h>
> +#include <part.h>
> +#include <ram.h>
> +#include <syscon.h>
> +#include <u-boot/uuid.h>
> +#include <u-boot/crc.h>
> +#include <u-boot/sha256.h>
> +#include <asm/cache.h>
> +#include <asm/io.h>
> +#include <asm/arch-rockchip/boot_mode.h>
> +#include <asm/arch-rockchip/clock.h>
> +#include <asm/arch-rockchip/periph.h>
> +#include <power/regulator.h>
> +
> +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && IS_ENABLED(CONFIG_EFI_PARTITION)

Considering that almost the entirety of this file is guarded by this 
ifdef, maybe make the rule in the Makefile for building efi.c only added 
when this is the case, e.g.

ifeq ($(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)$(CONFIG_EFI_PARTITION),yy)
obj-$(CONFIG_ROCKCHIP_COMMON_BOARD) += efi.o
endif

?

[...]
Cheers,
Quentin