X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fimage.mk;h=5e4dfb28e965925659b4f4f199388f5377b4a028;hb=772085468cb10f9954318c7e6b890500fdf6580b;hp=ddf19dd4b90fa7ae580c787ff10b173f481e2dba;hpb=1698c55a91cfbbc3dce93435b15ef5dbeab1682f;p=openwrt.git

diff --git a/include/image.mk b/include/image.mk
index ddf19dd4b9..5e4dfb28e9 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -129,18 +129,29 @@ ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
     endef
 endif
 
-# $(1): Board name (small caps)
-# $(2): kernel image
-# $(3): rootfs image
+# $(1): board name
+# $(2): rootfs type
+# $(3): kernel image
 ifneq ($(CONFIG_NAND_SUPPORT),)
    define Image/Build/SysupgradeNAND
-	mkdir -p $(KDIR_TMP)/sysupgrade-$(1)/
-	echo "BOARD=$(1)" > $(KDIR_TMP)/sysupgrade-$(1)/CONTROL
-	$(CP) $(2) $(KDIR_TMP)/sysupgrade-$(1)/kernel
-	$(CP) $(3) $(KDIR_TMP)/sysupgrade-$(1)/root
-	(cd $(KDIR_TMP); $(TAR) cvzf \
-		$(call imgname,ubi,$(1))-sysupgrade.tgz sysupgrade-$(1))
+	mkdir -p "$(KDIR_TMP)/sysupgrade-$(1)/"
+	echo "BOARD=$(1)" > "$(KDIR_TMP)/sysupgrade-$(1)/CONTROL"
+	[ -z "$(2)" ] || $(CP) "$(KDIR)/root.$(2)" "$(KDIR_TMP)/sysupgrade-$(1)/root"
+	[ -z "$(3)" ] || $(CP) "$(3)" "$(KDIR_TMP)/sysupgrade-$(1)/kernel"
+	(cd "$(KDIR_TMP)"; $(TAR) cvf \
+		"$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-sysupgrade.tar" sysupgrade-$(1))
    endef
+# $(1) board name
+# $(2) ubinize-image options (e.g. --uboot-env and/or --kernel kernelimage)
+# $(3) rootfstype (e.g. squashfs or ubifs)
+# $(4) options to pass-through to ubinize (i.e. $($(PROFILE)_UBI_OPTS)))
+   define Image/Build/UbinizeImage
+	sh $(TOPDIR)/scripts/ubinize-image.sh $(2) \
+		"$(KDIR)/root.$(3)" \
+		"$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(3)-ubinized.bin" \
+		$(4)
+   endef
+
 endif
 
 ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)