image: add wrapper variable to get the target dir for mkfs commands

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

diff --git a/include/image-commands.mk b/include/image-commands.mk
index e8549d46f6bc4229a0fec249360a916ead291d5a..fc36509efd604f9f1ffebb9f45fc4a53eedc2d07 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
@@ -105,8 +105,10 @@ define Build/append-ubi
                $(if $(KERNEL_IN_UBI),--kernel $(word 1,$^)) \
                $(word 2,$^) \
                $@.tmp \
-               -p $(BLOCKSIZE) -m $(PAGESIZE) -E 5 \
-               $(if $(SUBPAGESIZE),-s $(SUBPAGESIZE))
+               -p $(BLOCKSIZE) -m $(PAGESIZE) \
+               $(if $(SUBPAGESIZE),-s $(SUBPAGESIZE)) \
+               $(if $(VID_HDR_OFFSET),-O $(VID_HDR_OFFSET)) \
+               $(UBINIZE_OPTS)
        cat $@.tmp >> $@
        rm $@.tmp
 endef