commit ce2f09bcc2bdbc7a4b18f5db8a656768c4f98a98
author Simon Glass <sjg@chromium.org> Tue Jan 04 03:51:17 2022 -0700
committer Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Sat Jan 15 10:57:22 2022 +0100
tree 520e89caafbfa2472d66a472561e73f207c99469
parent 081dfcf783c80a8abf717df984c94970d128b98a

efi: Build the 64-bit app properly

Now that the linker crash is resolved, build the 64-bit EFI app, including
all the required code.

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

Makefile

diff --git a/Makefile b/Makefile
index 0034a84..b08bad4 100644
--- a/Makefile
+++ b/Makefile
@@ -1781,9 +1781,9 @@
 quiet_cmd_u-boot__ ?= LD      $@
       cmd_u-boot__ ?= $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_u-boot) -o $@		\
 		-T u-boot.lds $(u-boot-init)					\
-		$(if $(CONFIG_EFI_APP_64BIT),,--whole-archive)			\
+		--whole-archive							\
 			$(u-boot-main)						\
-		$(if $(CONFIG_EFI_APP_64BIT),,--no-whole-archive)		\
+		--no-whole-archive						\
 		$(PLATFORM_LIBS) -Map u-boot.map;				\
 		$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
 endif