projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: fix regression in append-dtb fix
[openwrt/openwrt.git]
/
include
/
image.mk
diff --git
a/include/image.mk
b/include/image.mk
index 9ab139cba679e2609eaf8ac24d05ac932eea5edc..2d7b1ef99860e22551f40729cb9463ddf801058b 100644
(file)
--- a/
include/image.mk
+++ b/
include/image.mk
@@
-438,17
+438,16
@@
endef
ifndef IB
define Device/Build/dtb
$(KDIR)/image-$(1).dtb: FORCE
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), \
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)) \
) \
))
) \
))