aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2016-03-20 14:41:06 +0000
committerJohn Crispin <john@openwrt.org>2016-03-20 14:41:06 +0000
commit4fe3fda78af4c9ebad06d8efc342ce58237cc44a (patch)
treee283ceb62254957fd3bf9957e1282713b7b7f9db /include
parent04f33f734973c5c9c108a7984b974d854d7db9a4 (diff)
downloadupstream-4fe3fda78af4c9ebad06d8efc342ce58237cc44a.tar.gz
upstream-4fe3fda78af4c9ebad06d8efc342ce58237cc44a.tar.bz2
upstream-4fe3fda78af4c9ebad06d8efc342ce58237cc44a.zip
include/image.mk: allow including U-Boot environment in UBI
Signed-off-by: Daniel Golle <daniel@makrotopia.org> SVN-Revision: 49039
Diffstat (limited to 'include')
-rw-r--r--include/image.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/image.mk b/include/image.mk
index 68686176df..7c11aa1c13 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -379,6 +379,7 @@ 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,$^) \
$@.tmp \