image.mk: fix append-dtb race when multiple devices use the same .dts

Call Image/BuildDTB unconditionally to keep things consistent

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 17ab46d859e38954350afb031eaab317e513b56b..1128aeab6d8b1a0a40652fe170ed2f4d73373306 100644 (file)
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -39,8 +39,8 @@ define Build/tplink-safeloader
 endef
 
 define Build/append-dtb
-    $(if $(DEVICE_DTS_DIR),$(call Image/BuildDTB,$(DEVICE_DTS_DIR)/$(DEVICE_DTS).dts,$(DTS_DIR)/$(DEVICE_DTS).dtb))
-    cat $(DTS_DIR)/$(DEVICE_DTS).dtb >> $@
+       $(call Image/BuildDTB,$(if $(DEVICE_DTS_DIR),$(DEVICE_DTS_DIR),$(DTS_DIR))/$(DEVICE_DTS).dts,$@.dtb)
+       cat $@.dtb >> $@
 endef
 
 define Build/fit