diff mbox series

[3/4] kbuild: spl: Add shrunk arch-dtbs to targets list

Message ID d438567895fbe6ce78d94e10596d34118a9a7f84.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>

This avoids needless rebuilding.

Fixes: 2f57c95100f2 ("spl: dm: Make it possible for the SPL to pick its own DTB from a FIT")
CC: Jean-Jacques Hiblot <jjhiblot at ti.com>
Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
---
 scripts/Makefile.spl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--
2.26.1

Comments

Tom Rini May 14, 2020, 5:15 p.m. UTC | #1 
On Mon, May 04, 2020 at 02:38:31PM +0200, Jan Kiszka wrote:

> From: Jan Kiszka <jan.kiszka at siemens.com>
> 
> This avoids needless rebuilding.
> 
> Fixes: 2f57c95100f2 ("spl: dm: Make it possible for the SPL to pick its own DTB from a FIT")
> CC: Jean-Jacques Hiblot <jjhiblot at ti.com>
> Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>

Applied to u-boot/master, thanks!

[Aside, I'm assuming Andrew will reply back still on 4/4, but 2/4 and
3/4 are needed to fix building / testing right now]
diff mbox series

Patch

diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 63ce5caf23..e6d56a1286 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -459,11 +459,14 @@  dtbs:
 # information in a variable so we can use it in if_changed and friends.
 .PHONY: $(PHONY)

-SHRUNK_ARCH_DTB = $(patsubst %,$(obj)/dts/%.dtb,$(subst ",,$(CONFIG_SPL_OF_LIST)))
+SPL_OF_LIST_TARGETS = $(patsubst %,dts/%.dtb,$(subst ",,$(CONFIG_SPL_OF_LIST)))
+SHRUNK_ARCH_DTB = $(addprefix $(obj)/,$(SPL_OF_LIST_TARGETS))
 .SECONDEXPANSION:
 $(SHRUNK_ARCH_DTB): $$(patsubst $(obj)/dts/%, arch/$(ARCH)/dts/%, $$@) dts_dir
 	$(call if_changed,fdtgrep)

+targets += $(SPL_OF_LIST_TARGETS)
+
 MKIMAGEFLAGS_$(SPL_BIN).multidtb.fit = -f auto -A $(ARCH) -T firmware -C none -O u-boot \
 	-n "Multi DTB fit image for $(SPL_BIN)" -E \
 	$(patsubst %,-b %,$(SHRUNK_ARCH_DTB))