build: fix regression in append-dtb fix
Strip whitespace from DTS directory Put the dependency earlier in the chain to avoid make errors Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
parent
eb58eba08b
commit
fae5f02912
1 changed files with 3 additions and 4 deletions
|
@ -438,17 +438,16 @@ endef
|
|||
ifndef IB
|
||||
define Device/Build/dtb
|
||||
$(KDIR)/image-$(1).dtb: FORCE
|
||||
$(call Image/BuildDTB,$(2)/$(1).dts,$$@)
|
||||
$(call Image/BuildDTB,$(strip $(2))/$(1).dts,$$@)
|
||||
|
||||
$(3): $(KDIR)/image-$(1).dtb
|
||||
image_prepare: $(KDIR)/image-$(1).dtb
|
||||
endef
|
||||
endif
|
||||
|
||||
define Device/Build/kernel
|
||||
$$(eval $$(foreach dts,$$(DEVICE_DTS), \
|
||||
$$(call Device/Build/dtb,$$(dts), \
|
||||
$$(if $$(DEVICE_DTS_DIR),$$(DEVICE_DTS_DIR),$$(DTS_DIR)),\
|
||||
$$(KDIR_KERNEL_IMAGE) $(KDIR)/$$(KERNEL_INITRAMFS_NAME) \
|
||||
$$(if $$(DEVICE_DTS_DIR),$$(DEVICE_DTS_DIR),$$(DTS_DIR)) \
|
||||
) \
|
||||
))
|
||||
|
||||
|
|
Loading…
Reference in a new issue