[PATCH 1/1] efi_loader: fix building with CONFIG_EFI_VARIABLES_PRESEED=y

[Nora Schiffer]

On Wed, 2026-06-24 at 07:48 +0200, Heinrich Schuchardt wrote:
> Since commit bd3f9ee679b4 ("kbuild: Bump the build system to 6.1")
> out-of-tree builds with CONFIG_EFI_VARIABLES_PRESEED=y fail with errors
> like:
> 
>     ../lib/efi_loader/efi_var_seed.S:14: Error: file not found:
>     ubootefi.var
> 
> For out-of-tree build we cannot use CONFIG_EFI_VAR_SEED_FILE in the
> .incbin statement of file efi_var_seed.S.
> 
> * We have to prepend $(srctree) if the path is relative.
> * We must not prepend $(srctree) if the path is absolute.
> 
> Fixes: bd3f9ee679b4 ("kbuild: Bump the build system to 6.1")
> Reported-by: Jon Mason <jon.mason at arm.com>
> Closes: https://lore.kernel.org/u-boot/CAPoiz9zg4OXgHo5J3WtJHKOEuWOdCDrugWfAt6Z+d71j=+q8oA@mail.gmail.com/T/#mffaca10a9e812d03eceafad59999a02e57258b9a
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>

Tested-by: Nora Schiffer <nora.schiffer at ew.tq-group.com>

> ---
>  lib/efi_loader/Makefile       | 7 +++++--
>  lib/efi_loader/efi_var_seed.S | 4 +---
>  2 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
> index d73ad43951b..567db518a8f 100644
> --- a/lib/efi_loader/Makefile
> +++ b/lib/efi_loader/Makefile
> @@ -74,8 +74,11 @@ obj-$(CONFIG_EFI_SIGNATURE_SUPPORT) += efi_signature.o
>  obj-$(CONFIG_EFI_ECPT) += efi_conformance.o
>  obj-$(CONFIG_EFI_DEBUG_SUPPORT) += efi_debug_support.o
>  
> -EFI_VAR_SEED_FILE := $(subst $\",,$(CONFIG_EFI_VAR_SEED_FILE))
> -$(obj)/efi_var_seed.o: $(srctree)/$(EFI_VAR_SEED_FILE)
> +TMP_VAR_SEED := $(subst $\",,$(CONFIG_EFI_VAR_SEED_FILE))
> +EFI_VAR_SEED_FILE := $(if $(filter /% ,$(TMP_VAR_SEED)) \
> +  ,$(TMP_VAR_SEED),$(srctree)/$(TMP_VAR_SEED))
> +AFLAGS_efi_var_seed.o := -DEFI_VAR_SEED_FILE=\"$(EFI_VAR_SEED_FILE)\"
> +$(obj)/efi_var_seed.o: $(EFI_VAR_SEED_FILE)
>  
>  ifeq ($(CONFIG_EFI_CAPSULE_AUTHENTICATE),y)
>  capsule_crt_path=($(subst $(quote),,$(CONFIG_EFI_CAPSULE_CRT_FILE)))
> diff --git a/lib/efi_loader/efi_var_seed.S b/lib/efi_loader/efi_var_seed.S
> index e0a40cf46c8..008a505d19e 100644
> --- a/lib/efi_loader/efi_var_seed.S
> +++ b/lib/efi_loader/efi_var_seed.S
> @@ -5,13 +5,11 @@
>   * Copyright (c) 2020, Heinrich Schuchardt <xypron.glpk at gmx.de>
>   */
>  
> -#include <config.h>
> -
>  .section .rodata.efi_seed.init,"a"
>  .balign 16
>  .global __efi_var_file_begin
>  __efi_var_file_begin:
> -.incbin CONFIG_EFI_VAR_SEED_FILE
> +.incbin EFI_VAR_SEED_FILE
>  .global __efi_var_file_end
>  __efi_var_file_end:
>  .balign 16

-- 
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany
Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
https://www.tq-group.com/