[PATCH v5 26/28] 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 --- Changes in v5: - Add new patch to avoid using the 64-bit link script for the EFI app arch/x86/cpu/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/cpu/config.mk b/arch/x86/cpu/config.mk index d3033b41603..87e242a2065 100644 --- a/arch/x86/cpu/config.mk +++ b/arch/x86/cpu/config.mk @@ -9,7 +9,7 @@ LDPPFLAGS += -DRESET_VEC_LOC=$(CONFIG_RESET_VEC_LOC) 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 -- 2.34.1.400.ga245620fadb-goog
Re: [PATCH v5 26/28] x86: efi: Don't use the 64-bit link script for the EFI app
On 12/4/21 16:56, Simon Glass wrote: > That script is not intended for use with EFI, so update the logic to avoid > using it. > > Signed-off-by: Simon Glass Signed-off-by: Christian Melki > --- > > Changes in v5: > - Add new patch to avoid using the 64-bit link script for the EFI app > > arch/x86/cpu/config.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/cpu/config.mk b/arch/x86/cpu/config.mk > index d3033b41603..87e242a2065 100644 > --- a/arch/x86/cpu/config.mk > +++ b/arch/x86/cpu/config.mk > @@ -9,7 +9,7 @@ LDPPFLAGS += -DRESET_VEC_LOC=$(CONFIG_RESET_VEC_LOC) > 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 >