diff mbox series

efi_loader: Moved the generated ESL file to objtree

Message ID 20250413113427.3126132-1-ilias.apalodimas@linaro.org
State Accepted
Commit 739ad58dbee874a3ad3bddd116e995212a254e07
Headers show
Series efi_loader: Moved the generated ESL file to objtree | expand

Commit Message

Ilias Apalodimas April 13, 2025, 11:34 a.m. UTC 
Tom reports that generating the ESL file we need for authenticated
capsule updates fails to work on azure which expects a RO git tree.

Move it to $(objtree)

Reported-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
---
 .gitignore              | 1 +
 Makefile                | 2 +-
 lib/efi_loader/Makefile | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

Comments

Tom Rini April 13, 2025, 2:09 p.m. UTC | #1 
On Sun, 13 Apr 2025 14:34:26 +0300, Ilias Apalodimas wrote:

> Tom reports that generating the ESL file we need for authenticated
> capsule updates fails to work on azure which expects a RO git tree.
> 
> Move it to $(objtree)
> 
> 

Applied to u-boot/master, thanks!

[1/1] efi_loader: Moved the generated ESL file to objtree
      commit: 739ad58dbee874a3ad3bddd116e995212a254e07
diff mbox series

Patch

diff --git a/.gitignore b/.gitignore
index e93c33da1bd2..272257a77bbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,6 +78,7 @@  fit-dtb.blob*
 /drivers/video/u_boot_logo.S
 /test/overlay/test-fdt-overlay.dtbo.S
 /test/overlay/test-fdt-overlay-stacked.dtbo.S
+capsule_esl_file
 
 #
 # Generated include files
diff --git a/Makefile b/Makefile
index 38f2e2bb72a0..73939748e542 100644
--- a/Makefile
+++ b/Makefile
@@ -2231,7 +2231,7 @@  CLEAN_FILES += include/autoconf.mk* include/bmp_logo.h include/bmp_logo_data.h \
 	       itb.fit.fit itb.fit.itb itb.map spl.map mkimage-out.rom.mkimage \
 	       mkimage.rom.mkimage mkimage-in-simple-bin* rom.map simple-bin* \
 	       idbloader-spi.img lib/efi_loader/helloworld_efi.S *.itb \
-	       Test* capsule*.*.efi-capsule capsule*.map capsule_esl_file
+	       Test* capsule*.*.efi-capsule capsule*.map
 
 # Directories & files removed with 'make mrproper'
 MRPROPER_DIRS  += include/config include/generated spl tpl vpl \
diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index dc2912148951..ab50a69e48b4 100644
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -79,7 +79,7 @@  capsule_crt_path=($(subst $(quote),,$(CONFIG_EFI_CAPSULE_CRT_FILE)))
 capsule_crt_full=$(srctree)/$(subst $(quote),,$(CONFIG_EFI_CAPSULE_CRT_FILE))
 quiet_cmd_capsule_esl_gen = CAPSULE_ESL_GEN $@
 cmd_capsule_esl_gen = cert-to-efi-sig-list $(capsule_crt_full) $@
-$(srctree)/capsule_esl_file: FORCE
+$(objtree)/capsule_esl_file: FORCE
 	@if [ ! -e "$(capsule_crt_full)" ]; then \
 		echo "ERROR: path $(capsule_crt_full) is invalid." >&2; \
 		echo "EFI CONFIG_EFI_CAPSULE_CRT_FILE must be specified when CONFIG_EFI_CAPSULE_AUTHENTICATE is enabled." >&2; \
@@ -87,8 +87,8 @@  $(srctree)/capsule_esl_file: FORCE
 	fi
 	$(call cmd,capsule_esl_gen)
 
-$(obj)/efi_capsule.o: $(srctree)/capsule_esl_file FORCE
-asflags-y += -DCAPSULE_ESL_PATH=\"$(srctree)/capsule_esl_file\"
+$(obj)/efi_capsule.o: $(objtree)/capsule_esl_file FORCE
+asflags-y += -DCAPSULE_ESL_PATH=\"$(objtree)/capsule_esl_file\"
 endif
 
 # Set the C flags to add and remove for each app