From e1b610b0844ed2d463fd7b508c7bbe85e8093d49 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 16 Jan 2017 07:04:12 -0700 Subject: [PATCH] x86: Don't build 32-bit efi files on x86_64 These cannot be built in this mode, so drop them. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/lib/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index f737b7ecc2..05e212f9bf 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -48,7 +48,9 @@ OBJCOPYFLAGS := --prefix-symbols=__normal_ $(obj)/lib.a: $(NORMAL_LIBGCC) FORCE $(call if_changed,objcopy) +ifeq ($(CONFIG_$(SPL_)X86_64),) obj-$(CONFIG_EFI_APP) += crt0_ia32_efi.o reloc_ia32_efi.o +endif ifneq ($(CONFIG_EFI_STUB),) @@ -68,5 +70,7 @@ extra-$(CONFIG_EFI_STUB_64BIT) += crt0_x86_64_efi.o reloc_x86_64_efi.o endif ifneq ($(CONFIG_EFI_STUB)$(CONFIG_CMD_BOOTEFI_HELLO_COMPILE),) +ifeq ($(CONFIG_$(SPL_)X86_64),) extra-y += $(EFI_CRT0) $(EFI_RELOC) endif +endif -- 2.25.1