diff mbox series

scripts/Makefile.spl: Use 'sort' in SHRUNK_ARCH_DTB rule

Message ID 20240319165131.1651802-1-trini@konsulko.com
State Accepted
Commit e8ff287595465fd8c68c2f1a0c9577825263a8a8
Delegated to: Tom Rini
Headers show
Series scripts/Makefile.spl: Use 'sort' in SHRUNK_ARCH_DTB rule | expand

Commit Message

Tom Rini March 19, 2024, 4:51 p.m. UTC
With configs such as "am64x_evm_a53" or "imx8mp_venice" which list
multiple device trees to build we get a warning such as:
scripts/Makefile.spl:578: target 'spl/dts/freescale/' given more than once in the same rule

If we sort this list first the warning goes away.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 scripts/Makefile.spl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michal Simek March 22, 2024, 7:13 a.m. UTC | #1
Ășt 19. 3. 2024 v 17:51 odesĂ­latel Tom Rini <trini@konsulko.com> napsal:

> With configs such as "am64x_evm_a53" or "imx8mp_venice" which list
> multiple device trees to build we get a warning such as:
> scripts/Makefile.spl:578: target 'spl/dts/freescale/' given more than once
> in the same rule
>
> If we sort this list first the warning goes away.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  scripts/Makefile.spl | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
> index d074ba235006..60db38d5bddd 100644
> --- a/scripts/Makefile.spl
> +++ b/scripts/Makefile.spl
> @@ -575,7 +575,7 @@ endif
>
>  SPL_OF_LIST_TARGETS = $(patsubst %,dts/%.dtb,$(subst
> ",,$(CONFIG_SPL_OF_LIST)))
>  SHRUNK_ARCH_DTB = $(addprefix $(obj)/,$(SPL_OF_LIST_TARGETS))
> -$(dir $(SHRUNK_ARCH_DTB)):
> +$(sort $(dir $(SHRUNK_ARCH_DTB))):
>         $(shell [ -d $@ ] || mkdir -p $@)
>
>  .SECONDEXPANSION:
> --
> 2.34.1
>
>
The same issue also for zynqmp.
Tested-by: Michal Simek <michal.simek@amd.com>

Thanks,
Michal
Tom Rini April 10, 2024, 5:43 p.m. UTC | #2
On Tue, 19 Mar 2024 12:51:31 -0400, Tom Rini wrote:

> With configs such as "am64x_evm_a53" or "imx8mp_venice" which list
> multiple device trees to build we get a warning such as:
> scripts/Makefile.spl:578: target 'spl/dts/freescale/' given more than once in the same rule
> 
> If we sort this list first the warning goes away.
> 
> 
> [...]

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

Patch

diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index d074ba235006..60db38d5bddd 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -575,7 +575,7 @@  endif
 
 SPL_OF_LIST_TARGETS = $(patsubst %,dts/%.dtb,$(subst ",,$(CONFIG_SPL_OF_LIST)))
 SHRUNK_ARCH_DTB = $(addprefix $(obj)/,$(SPL_OF_LIST_TARGETS))
-$(dir $(SHRUNK_ARCH_DTB)):
+$(sort $(dir $(SHRUNK_ARCH_DTB))):
 	$(shell [ -d $@ ] || mkdir -p $@)
 
 .SECONDEXPANSION: