build: add template for installing device .dtb files

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

diff --git a/include/image-commands.mk b/include/image-commands.mk
index e8549d46f6bc4229a0fec249360a916ead291d5a..160b5d883395d3ef53f4c61426ea27a5dbd3a063 100644 (file)
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -1,5 +1,8 @@
 # Build commands that can be called from Device/* templates
 
+IMAGE_KERNEL = $(word 1,$^)
+IMAGE_ROOTFS = $(word 2,$^)
+
 define Build/uImage
        mkimage -A $(LINUX_KARCH) \
                -O linux -T kernel \
@@ -30,7 +33,7 @@ define Build/tplink-safeloader
        -$(STAGING_DIR_HOST)/bin/tplink-safeloader \
                -B $(TPLINK_BOARD_NAME) \
                -V $(REVISION) \
-               -k $(word 1,$^) \
+               -k $(IMAGE_KERNEL) \
                -r $@ \
                -o $@.new \
                -j \
@@ -39,8 +42,16 @@ 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/install-dtb
+       $(foreach dts,$(DEVICE_DTS), \
+               $(CP) \
+                       $(DTS_DIR)/$(dts).dtb \
+                       $(BIN_DIR)/$(IMG_PREFIX)-$(dts).dtb; \
+       )
 endef
 
 define Build/fit
@@ -92,21 +103,23 @@ define Build/patch-cmdline
 endef
 
 define Build/append-kernel
-       dd if=$(word 1,$^) $(if $(1),bs=$(1) conv=sync) >> $@
+       dd if=$(IMAGE_KERNEL) $(if $(1),bs=$(1) conv=sync) >> $@
 endef
 
 define Build/append-rootfs
-       dd if=$(word 2,$^) $(if $(1),bs=$(1) conv=sync) >> $@
+       dd if=$(IMAGE_ROOTFS) $(if $(1),bs=$(1) conv=sync) >> $@
 endef
 
 define Build/append-ubi
        sh $(TOPDIR)/scripts/ubinize-image.sh \
                $(if $(UBOOTENV_IN_UBI),--uboot-env) \
-               $(if $(KERNEL_IN_UBI),--kernel $(word 1,$^)) \
-               $(word 2,$^) \
+               $(if $(KERNEL_IN_UBI),--kernel $(IMAGE_KERNEL)) \
+               $(IMAGE_ROOTFS) \
                $@.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
@@ -140,16 +153,16 @@ endef
 
 define Build/combined-image
        -sh $(TOPDIR)/scripts/combined-image.sh \
-               "$(word 1,$^)" \
+               "$(IMAGE_KERNEL)" \
                "$@" \
                "$@.new"
        @mv $@.new $@
 endef
 
-define Build/sysupgrade-nand
-       sh $(TOPDIR)/scripts/sysupgrade-nand.sh \
+define Build/sysupgrade-tar
+       sh $(TOPDIR)/scripts/sysupgrade-tar.sh \
                --board $(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \
-               --kernel $(word 1,$^) \
-               --rootfs $(word 2,$^) \
+               --kernel $(call param_get_default,kernel,$(1),$(IMAGE_KERNEL)) \
+               --rootfs $(call param_get_default,rootfs,$(1),$(IMAGE_ROOTFS)) \
                $@
 endef