aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-06-27 12:58:08 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-06-27 12:58:08 +0000
commitdc9ebfc9e6543bc9d757e41584015d6e5c7a6a70 (patch)
treec04ccafd8938db8fdc7643c994ba3c873e24fbd3 /include
parent42bc2c49aef36b48c7b5a5f7b25b66c5bbca1d9d (diff)
downloadupstream-dc9ebfc9e6543bc9d757e41584015d6e5c7a6a70.tar.gz
upstream-dc9ebfc9e6543bc9d757e41584015d6e5c7a6a70.tar.bz2
upstream-dc9ebfc9e6543bc9d757e41584015d6e5c7a6a70.zip
make UbinizeImage work nicely without a kernel volume
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 41359
Diffstat (limited to 'include')
-rw-r--r--include/image.mk9
1 files changed, 4 insertions, 5 deletions
diff --git a/include/image.mk b/include/image.mk
index 71971e21ca..5e4dfb28e9 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -142,15 +142,14 @@ ifneq ($(CONFIG_NAND_SUPPORT),)
"$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-sysupgrade.tar" sysupgrade-$(1))
endef
# $(1) board name
-# $(2) ubinize-image options (e.g. --no-kernel and/or --uboot-env)
+# $(2) ubinize-image options (e.g. --uboot-env and/or --kernel kernelimage)
# $(3) rootfstype (e.g. squashfs or ubifs)
-# $(4) kernel image file
-# $(5) options to pass-through to ubinize (i.e. $($(PROFILE)_UBI_OPTS)))
+# $(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)" "$(4)" \
+ "$(KDIR)/root.$(3)" \
"$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(3)-ubinized.bin" \
- $(5)
+ $(4)
endef
endif