[PATCH 1/3] Revert "efi_loader: Moved the generated ESL file to objtree"

[Simon Glass]

This reverts commit 31f66cd7577664ea8725520bf2083cf010fbc477.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 .gitignore              | 1 -
 lib/efi_loader/Makefile | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 272257a77bb..e93c33da1bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,7 +78,6 @@ 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/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index cf050e5385d..d8864e87052 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) $@
-$(objtree)/capsule_esl_file: FORCE
+$(srctree)/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 @@ $(objtree)/capsule_esl_file: FORCE
 	fi
 	$(call cmd,capsule_esl_gen)
 
-$(obj)/efi_capsule.o: $(objtree)/capsule_esl_file FORCE
-asflags-y += -DCAPSULE_ESL_PATH=\"$(objtree)/capsule_esl_file\"
+$(obj)/efi_capsule.o: $(srctree)/capsule_esl_file FORCE
+asflags-y += -DCAPSULE_ESL_PATH=\"$(srctree)/capsule_esl_file\"
 endif
 
 # Set the C flags to add and remove for each app
-- 
2.34.1