From patchwork Mon May  4 12:38:29 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Kiszka <jan.kiszka@web.de>
X-Patchwork-Id: 244996
List-Id: U-Boot discussion <u-boot.lists.denx.de>
From: jan.kiszka at web.de (Jan Kiszka)
Date: Mon,  4 May 2020 14:38:29 +0200
Subject: [PATCH 1/4] kbuild: efi: Avoid rebuilding efi targets
In-Reply-To: <cover.1588595912.git.jan.kiszka@web.de>
References: <cover.1588595912.git.jan.kiszka@web.de>
Message-ID: <ff6c0ca4c6150a0585b09b3d9ccb6d5a74237a2a.1588595912.git.jan.kiszka@web.de>

From: Jan Kiszka <jan.kiszka at siemens.com>

Add a couple of missing targets so that helloworld and other efi targets
are not needlessly rebuilt.

CC: Heinrich Schuchardt <xypron.glpk at gmx.de>
Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
Tested-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
---
 lib/efi_loader/Makefile | 1 +
 scripts/Makefile.lib    | 2 ++
 2 files changed, 3 insertions(+)

--
2.26.1

diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index eff3c25ec3..84d61df55b 100644
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -17,6 +17,7 @@ CFLAGS_REMOVE_helloworld.o := $(CFLAGS_NON_EFI)

 ifneq ($(CONFIG_CMD_BOOTEFI_HELLO_COMPILE),)
 always += helloworld.efi
+targets += helloworld.o
 endif

 obj-$(CONFIG_CMD_BOOTEFI_HELLO) += helloworld_efi.o
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 63fbadd757..734001c952 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -418,6 +418,8 @@ $(obj)/efi_reloc.o: $(srctree)/arch/$(ARCH)/lib/$(EFI_RELOC:.o=.c) $(recordmcoun
 $(obj)/%_efi.so: $(obj)/%.o $(obj)/efi_crt0.o $(obj)/efi_reloc.o $(obj)/efi_freestanding.o
 	$(call cmd,efi_ld)

+targets += $(obj)/efi_crt0.o $(obj)/efi_reloc.o $(obj)/efi_freestanding.o
+
 # ACPI
 # ---------------------------------------------------------------------------
 #