From: Michal Simek <michal.simek@xilinx.com>
Date: Wed, 21 Nov 2018 13:04:20 +0000 (+0100)
Subject: Revert "efi_loader: avoid make race condition"
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd7682b88ef098793312440764a84040c07b551c;p=thirdparty%2Fu-boot.git

Revert "efi_loader: avoid make race condition"

This reverts commit 2f61b13d6acba787b00598d519c85222e993e4ca.

There is an issue when you build u-boot for arm and then for arm64
without make mrproper between.

Error log:
lib/efi_loader/efi_crt0.o: error adding symbols: File in wrong format
make[2]: *** [lib/efi_loader/helloworld_efi.so] Error 1
rm lib/efi_loader/helloworld.o
make[1]: *** [lib/efi_loader] Error 2
make[1]: *** Waiting for unfinished jobs....

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 4dceb6d1b37..9b64a634198 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -385,14 +385,8 @@ cmd_efi_ld = $(LD) -nostdlib -znocombreloc -T $(EFI_LDS_PATH) -shared \
 
 EFI_LDS_PATH = $(srctree)/arch/$(ARCH)/lib/$(EFI_LDS)
 
-$(obj)/efi_crt0.o: $(srctree)/arch/$(ARCH)/lib/$(EFI_CRT0:.o=.S)
-	$(call if_changed_dep,as_o_S)
-
-$(obj)/efi_reloc.o: $(srctree)/arch/$(ARCH)/lib/$(EFI_RELOC:.o=.c) $(recordmcount_source) FORCE
-	$(call cmd,force_checksrc)
-	$(call if_changed_rule,cc_o_c)
-
-$(obj)/%_efi.so: $(obj)/%.o $(obj)/efi_crt0.o $(obj)/efi_reloc.o
+$(obj)/%_efi.so: $(obj)/%.o arch/$(ARCH)/lib/$(EFI_CRT0) \
+		arch/$(ARCH)/lib/$(EFI_RELOC)
 	$(call cmd,efi_ld)
 
 # ACPI