| Message ID | 20211204085647.v5.26.I457b0dce49eb718fa49be2583f8ea506beddb93c@changeid |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | Heinrich Schuchardt |
| Headers | show |
| Series | efi: Improvements to U-Boot running on top of UEFI | expand |
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 <sjg@chromium.org> Signed-off-by: Christian Melki <christian.melki@t2data.com> > --- > > 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 >
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
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> --- 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(-)