mkits: support definition of DTB loadaddr

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

diff --git a/include/image-commands.mk b/include/image-commands.mk
index eda3fee94b2e031367a1b9b9712ee10fe5e74c99..1f6ba1c15a47e983692a0a100721e4420476818a 100644 (file)
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -4,7 +4,7 @@ IMAGE_KERNEL = $(word 1,$^)
 IMAGE_ROOTFS = $(word 2,$^)
 
 define ModelNameLimit16
-$(shell expr substr "$(word 2, $(subst _, ,$(1)))" 1 16)
+$(shell printf %.16s "$(word 2, $(subst _, ,$(1)))")
 endef
 
 define rootfs_align
@@ -37,7 +37,11 @@ define Build/package-kernel-ubifs
 endef
 
 define Build/append-image
-       dd if=$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1) >> $@
+       cp "$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1)" "$@.stripmeta"
+       fwtool -s /dev/null -t "$@.stripmeta" || :
+       fwtool -i /dev/null -t "$@.stripmeta" || :
+       dd if="$@.stripmeta" >> "$@"
+       rm "$@.stripmeta"
 endef
 
 ifdef IB
@@ -46,8 +50,12 @@ define Build/append-image-stage
 endef
 else
 define Build/append-image-stage
-       dd if=$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1) of=$(STAGING_DIR_IMAGE)/$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))-$(DEVICE_NAME)-$(1)
-       dd if=$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1) >> $@
+       cp "$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1)" "$@.stripmeta"
+       fwtool -s /dev/null -t "$@.stripmeta" || :
+       fwtool -i /dev/null -t "$@.stripmeta" || :
+       dd if="$@.stripmeta" of="$(STAGING_DIR_IMAGE)/$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))-$(DEVICE_NAME)-$(1)"
+       dd if="$@.stripmeta" >> "$@"
+       rm "$@.stripmeta"
 endef
 endif
 
@@ -81,6 +89,7 @@ metadata_json = \
 
 define Build/append-metadata
        $(if $(SUPPORTED_DEVICES),-echo $(call metadata_json) | fwtool -I - $@)
+       sha256sum "$@" | cut -d" " -f1 > "$@.sha256sum"
        [ ! -s "$(BUILD_KEY)" -o ! -s "$(BUILD_KEY).ucert" -o ! -s "$@" ] || { \
                cp "$(BUILD_KEY).ucert" "$@.ucert" ;\
                usign -S -m "$@" -s "$(BUILD_KEY)" -x "$@.sig" ;\
@@ -103,6 +112,15 @@ define Build/append-squashfs-fakeroot-be
        cat $@.fakesquashfs >> $@
 endef
 
+define Build/append-squashfs4-fakeroot
+       rm -rf $@.fakefs $@.fakesquashfs
+       mkdir $@.fakefs
+       $(STAGING_DIR_HOST)/bin/mksquashfs4 \
+               $@.fakefs $@.fakesquashfs \
+               -nopad -noappend -root-owned
+       cat $@.fakesquashfs >> $@
+endef
+
 define Build/append-string
        echo -n $(1) >> $@
 endef
@@ -191,7 +209,7 @@ define Build/check-size
        @imagesize="$$(stat -c%s $@)"; \
        limitsize="$$(($(subst k,* 1024,$(subst m, * 1024k,$(if $(1),$(1),$(IMAGE_SIZE))))))"; \
        [ $$limitsize -ge $$imagesize ] || { \
-               echo "WARNING: Image file $@ is too big: $$imagesize > $$limitsize" >&2; \
+               $(call ERROR_MESSAGE,    WARNING: Image file $@ is too big: $$imagesize > $$limitsize); \
                rm -f $@; \
        }
 endef
@@ -200,6 +218,11 @@ define Build/copy-file
        cat "$(1)" > "$@"
 endef
 
+define Build/edimax-header
+       $(STAGING_DIR_HOST)/bin/mkedimaximg -i $@ -o $@.new $(1)
+       @mv $@.new $@
+endef
+
 define Build/elecom-product-header
        $(eval product=$(word 1,$(1)))
        $(eval fw=$(if $(word 2,$(1)),$(word 2,$(1)),$@))
@@ -261,9 +284,11 @@ endef
 define Build/fit
        $(TOPDIR)/scripts/mkits.sh \
                -D $(DEVICE_NAME) -o $@.its -k $@ \
-               -C $(word 1,$(1)) $(if $(word 2,$(1)),\
-               $(if $(DEVICE_DTS_OVERLAY),-d $(KERNEL_BUILD_DIR)/image-$$(basename $(word 2,$(1))),\
-                       -d $(word 2,$(1)))) \
+               -C $(word 1,$(1)) \
+               $(if $(word 2,$(1)),\
+                       $(if $(findstring 11,$(if $(DEVICE_DTS_OVERLAY),1)$(if $(findstring $(KERNEL_BUILD_DIR)/image-,$(word 2,$(1))),,1)), \
+                               -d $(KERNEL_BUILD_DIR)/image-$$(basename $(word 2,$(1))), \
+                               -d $(word 2,$(1)))) \
                $(if $(findstring with-rootfs,$(word 3,$(1))),-r $(IMAGE_ROOTFS)) \
                $(if $(findstring with-initrd,$(word 3,$(1))), \
                        $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE), \
@@ -271,6 +296,7 @@ define Build/fit
                -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
                $(if $(DEVICE_FDT_NUM),-n $(DEVICE_FDT_NUM)) \
                $(if $(DEVICE_DTS_DELIMITER),-l $(DEVICE_DTS_DELIMITER)) \
+               $(if $(DEVICE_DTS_LOADADDR),-s $(DEVICE_DTS_LOADADDR)) \
                $(if $(DEVICE_DTS_OVERLAY),$(foreach dtso,$(DEVICE_DTS_OVERLAY), -O $(dtso):$(KERNEL_BUILD_DIR)/image-$(dtso).dtb)) \
                -c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config-1") \
                -A $(LINUX_KARCH) -v $(LINUX_VERSION)
@@ -295,6 +321,11 @@ define Build/install-dtb
        )
 endef
 
+define Build/iptime-crc32
+       $(STAGING_DIR_HOST)/bin/iptime-crc32 $(1) $@ $@.new
+       mv $@.new $@
+endef
+
 define Build/iptime-naspkg
        $(STAGING_DIR_HOST)/bin/iptime-naspkg $(1) $@ $@.new
        mv $@.new $@
@@ -362,6 +393,19 @@ define Build/netgear-dni
        mv $@.new $@
 endef
 
+define Build/netgear-encrypted-factory
+       $(TOPDIR)/scripts/netgear-encrypted-factory.py \
+               --input-file $@ \
+               --output-file $@ \
+               --model $(NETGEAR_ENC_MODEL) \
+               --region $(NETGEAR_ENC_REGION) \
+               --version V1.0.0.0.$(VERSION_DIST).$(firstword $(subst -, ,$(REVISION))) \
+               --encryption-block-size 0x20000 \
+               --openssl-bin "$(STAGING_DIR_HOST)/bin/openssl" \
+               --key 6865392d342b4d212964363d6d7e7765312c7132613364316e26322a5a5e2538 \
+               --iv 4a253169516c38243d6c6d2d3b384145
+endef
+
 define Build/openmesh-image
        $(TOPDIR)/scripts/om-fwupgradecfg-gen.sh \
                "$(call param_get_default,ce_type,$(1),$(DEVICE_NAME))" \
@@ -536,9 +580,7 @@ define Build/zip
        rm -rf $@.tmp
        mkdir $@.tmp
        mv $@ $@.tmp/$(word 1,$(1))
-
-       $(STAGING_DIR_HOST)/bin/zip -j -X \
-               $(if $(SOURCE_DATE_EPOCH),--mtime="$(SOURCE_DATE_EPOCH)") \
+       TZ=UTC $(STAGING_DIR_HOST)/bin/zip -j -X \
                $(wordlist 2,$(words $(1)),$(1)) \
                $@ $@.tmp/$(if $(word 1,$(1)),$(word 1,$(1)),$$(basename $@))
        rm -rf $@.tmp