commit 59e8f36dd93e75f406410be97057b22e452741b1
author Simon Glass <sjg@chromium.org> Tue Jan 04 03:51:15 2022 -0700
committer Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Sat Jan 15 10:57:22 2022 +0100
tree 7e726f75421881b757655e0770d6bf9e595038b8
parent 3b4ae096b0ed21f3646378cb58d4c03ea2404bac

x86: efi: Don't use the 64-bit link script for the EFI app

That script is not intended for use with EFI, so update the logic to avoid
using it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Christian Melki <christian.melki@t2data.com>

arch/x86/cpu/config.mk

diff --git a/arch/x86/cpu/config.mk b/arch/x86/cpu/config.mk
index d3033b4..87e242a 100644
--- a/arch/x86/cpu/config.mk
+++ b/arch/x86/cpu/config.mk
@@ -9,7 +9,7 @@
 LDPPFLAGS += -DSTART_16=$(CONFIG_SYS_X86_START16)
 
 ifdef CONFIG_X86_64
-ifndef CONFIG_SPL_BUILD
+ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_EFI_APP),)
 LDSCRIPT = $(srctree)/arch/x86/cpu/u-boot-64.lds
 endif
 endif