aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-16 18:55:18 +0000
committerJohn Crispin <john@openwrt.org>2014-06-16 18:55:18 +0000
commit28277caccb1590f63e392dc90ffe7a2a83658878 (patch)
tree483302ad0634217714c8b2f6fd6c2a93caa99352
parent3dca5a158d4fe129d7cf245587e3581538ff8e24 (diff)
downloadupstream-28277caccb1590f63e392dc90ffe7a2a83658878.tar.gz
upstream-28277caccb1590f63e392dc90ffe7a2a83658878.tar.bz2
upstream-28277caccb1590f63e392dc90ffe7a2a83658878.zip
include/image.mk: cleanup the SysupgradeNAND template
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 41223
-rw-r--r--include/image.mk12
1 files changed, 7 insertions, 5 deletions
diff --git a/include/image.mk b/include/image.mk
index ddf19dd4b9..605474ce99 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -129,17 +129,19 @@ ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
endef
endif
-# $(1): Board name (small caps)
+# $(1): board name
# $(2): kernel image
# $(3): rootfs image
+# $(4): ubi 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))
+ [ -z "$(2)" ] || $(CP) $(2) $(KDIR_TMP)/sysupgrade-$(1)/kernel
+ [ -z "$(3)" ] || $(CP) $(3) $(KDIR_TMP)/sysupgrade-$(1)/root
+ [ -z "$(4)" ] || $(CP) $(4) $(KDIR_TMP)/sysupgrade-$(1)/ubi
+ (cd $(KDIR_TMP); $(TAR) cvf \
+ $(BIN_DIR)/$(IMG_PREFIX)-$(1)-ubi-sysupgrade.tar sysupgrade-$(1))
endef
endif