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>

diff --git a/Makefile b/Makefile
index 0034a844b48954fa9bb90feb07644d32f317ff3a..b08bad4873827bb5445f02924e9f4d98b359b47f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1781,9 +1781,9 @@ else
 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