diff mbox series

[3/3] efi: Correct .efi rules

Message ID 20230430012147.1046188-3-sjg@chromium.org
State Accepted
Commit c52bd0362dc3830013de290d02ea69181a0ab8e6
Delegated to: Tom Rini
Headers show
Series [1/3] Makefile: Fix incorrect FORCE deps on env rules | expand

Commit Message

Simon Glass April 30, 2023, 1:21 a.m. UTC
These files should have both 'always' and 'targets' so that dependencies
are detected correctly.

When only 'always' is used, the target is built every time, although I am
not quite sure why.

Make sure each has both 'always' and 'targets' to avoid this problem.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 lib/efi_loader/Makefile | 3 +++
 1 file changed, 3 insertions(+)

Comments

Heinrich Schuchardt April 30, 2023, 3 p.m. UTC | #1
Am 30. April 2023 03:21:47 MESZ schrieb Simon Glass <sjg@chromium.org>:
>These files should have both 'always' and 'targets' so that dependencies
>are detected correctly.
>
>When only 'always' is used, the target is built every time, although I am
>not quite sure why.
>
>Make sure each has both 'always' and 'targets' to avoid this problem.
>
>Signed-off-by: Simon Glass <sjg@chromium.org>
>---
>
> lib/efi_loader/Makefile | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
>index 13a35eae6c06..1a8c8d7cab5c 100644
>--- a/lib/efi_loader/Makefile
>+++ b/lib/efi_loader/Makefile

How about lib/efi_selftest/Makefile? Any changes needed there too?

Best regards

Heinrich


>@@ -23,6 +23,7 @@ CFLAGS_REMOVE_initrddump.o := $(CFLAGS_NON_EFI)
> 
> ifdef CONFIG_RISCV
> always += boothart.efi
>+targets += boothart.o
> endif
> 
> ifneq ($(CONFIG_CMD_BOOTEFI_HELLO_COMPILE),)
>@@ -32,10 +33,12 @@ endif
> 
> ifeq ($(CONFIG_GENERATE_ACPI_TABLE),)
> always += dtbdump.efi
>+targets += dtbdump.o
> endif
> 
> ifdef CONFIG_EFI_LOAD_FILE2_INITRD
> always += initrddump.efi
>+targets += initrddump.o
> endif
> 
> obj-$(CONFIG_CMD_BOOTEFI_HELLO) += helloworld_efi.o
Simon Glass May 1, 2023, 4:40 p.m. UTC | #2
Hi Heinrich,

On Sun, 30 Apr 2023 at 09:00, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
>
>
>
> Am 30. April 2023 03:21:47 MESZ schrieb Simon Glass <sjg@chromium.org>:
> >These files should have both 'always' and 'targets' so that dependencies
> >are detected correctly.
> >
> >When only 'always' is used, the target is built every time, although I am
> >not quite sure why.
> >
> >Make sure each has both 'always' and 'targets' to avoid this problem.
> >
> >Signed-off-by: Simon Glass <sjg@chromium.org>
> >---
> >
> > lib/efi_loader/Makefile | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> >diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
> >index 13a35eae6c06..1a8c8d7cab5c 100644
> >--- a/lib/efi_loader/Makefile
> >+++ b/lib/efi_loader/Makefile
>
> How about lib/efi_selftest/Makefile? Any changes needed there too?

Not that I can see.

Regards,
Simon
Tom Rini June 1, 2023, 3:24 p.m. UTC | #3
On Sat, Apr 29, 2023 at 07:21:47PM -0600, Simon Glass wrote:

> These files should have both 'always' and 'targets' so that dependencies
> are detected correctly.
> 
> When only 'always' is used, the target is built every time, although I am
> not quite sure why.
> 
> Make sure each has both 'always' and 'targets' to avoid this problem.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/next, thanks!
diff mbox series

Patch

diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index 13a35eae6c06..1a8c8d7cab5c 100644
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -23,6 +23,7 @@  CFLAGS_REMOVE_initrddump.o := $(CFLAGS_NON_EFI)
 
 ifdef CONFIG_RISCV
 always += boothart.efi
+targets += boothart.o
 endif
 
 ifneq ($(CONFIG_CMD_BOOTEFI_HELLO_COMPILE),)
@@ -32,10 +33,12 @@  endif
 
 ifeq ($(CONFIG_GENERATE_ACPI_TABLE),)
 always += dtbdump.efi
+targets += dtbdump.o
 endif
 
 ifdef CONFIG_EFI_LOAD_FILE2_INITRD
 always += initrddump.efi
+targets += initrddump.o
 endif
 
 obj-$(CONFIG_CMD_BOOTEFI_HELLO) += helloworld_efi.o