diff mbox series

[1/4] kbuild: efi: Avoid rebuilding efi targets

Message ID ff6c0ca4c6150a0585b09b3d9ccb6d5a74237a2a.1588595912.git.jan.kiszka@web.de
State New
Headers show
Series Various build dependency fixes | expand

Commit Message

Jan Kiszka May 4, 2020, 12:38 p.m. UTC 
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>
---
 lib/efi_loader/Makefile | 1 +
 scripts/Makefile.lib    | 2 ++
 2 files changed, 3 insertions(+)

--
2.26.1

Comments

Heinrich Schuchardt May 4, 2020, 6:35 p.m. UTC | #1 
On 5/4/20 2:38 PM, Jan Kiszka wrote:
> 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(+)
>
> 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
>  # ---------------------------------------------------------------------------
>  #
> --
> 2.26.1
>
diff mbox series

Patch

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
 # ---------------------------------------------------------------------------
 #