aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2016-03-20 14:41:06 +0000
committerJohn Crispin <blogic@openwrt.org>2016-03-20 14:41:06 +0000
commitbe949aac09295c28ffd3e894598406c162cf7bcf (patch)
tree4fbc9c616bb0e8870f8fc7b651236c81889484a2 /include
parent016e938f01a19d52c5770a3666b3f83b04386418 (diff)
downloadmaster-187ad058-be949aac09295c28ffd3e894598406c162cf7bcf.tar.gz
master-187ad058-be949aac09295c28ffd3e894598406c162cf7bcf.tar.bz2
master-187ad058-be949aac09295c28ffd3e894598406c162cf7bcf.zip
include/image.mk: allow including U-Boot environment in UBI
Signed-off-by: Daniel Golle <daniel@makrotopia.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49039 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 \