build: allow calling append-dtb from image build commands

[openwrt/openwrt.git] / include / image-commands.mk

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 4fe8c0f4566e2c698d131cf9c93367a26e693177..1ec5252972c3a012c9bef782133fedb41af78b58 100644 (file)
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -102,8 +102,7 @@ define Build/tplink-safeloader
 endef
 
 define Build/append-dtb
-       $(call Image/BuildDTB,$(if $(DEVICE_DTS_DIR),$(DEVICE_DTS_DIR),$(DTS_DIR))/$(DEVICE_DTS).dts,$@.dtb)
-       cat $@.dtb >> $@
+       cat $(KDIR)/image-$(firstword $(DEVICE_DTS)).dtb >> $@
 endef
 
 define Build/install-dtb
@@ -249,7 +248,8 @@ endef
 
 define Build/tplink-v2-header
        $(STAGING_DIR_HOST)/bin/mktplinkfw2 \
-               -c -H $(TPLINK_HWID) -W $(TPLINK_HWREV) \
+               -c -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -L $(KERNEL_LOADADDR) \
+               -E $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR))  \
                -w $(TPLINK_HWREVADD) -F "$(TPLINK_FLASHLAYOUT)" \
                -T $(TPLINK_HVERSION) -V "ver. 2.0" \
                -k $@ -o $@.new $(1)