From dc9ebfc9e6543bc9d757e41584015d6e5c7a6a70 Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Fri, 27 Jun 2014 12:58:08 +0000
Subject: [PATCH] make UbinizeImage work nicely without a kernel volume

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 41359
---
 include/image.mk         |  9 ++++-----
 scripts/ubinize-image.sh | 14 ++++----------
 2 files changed, 8 insertions(+), 15 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
diff --git a/scripts/ubinize-image.sh b/scripts/ubinize-image.sh
index 6ffedc5f32..1b782a6cdc 100755
--- a/scripts/ubinize-image.sh
+++ b/scripts/ubinize-image.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 ubootenv=""
-nokernel=""
 ubinize_param=""
 kernel=""
 rootfs=""
@@ -63,8 +62,8 @@ while [ "$1" ]; do
 		shift
 		continue
 		;;
-	"--no-kernel")
-		nokernel="nokernel"
+	"--kernel")
+		kernel="$2"
 		shift
 		continue
 		;;
@@ -73,11 +72,6 @@ while [ "$1" ]; do
 		break
 		;;
 	*)
-		if [ ! "$kernel" -a ! "$nokernel" ]; then
-			kernel=$1
-			shift
-			continue
-		fi
 		if [ ! "$rootfs" ]; then
 			rootfs=$1
 			shift
@@ -92,8 +86,8 @@ while [ "$1" ]; do
 	esac
 done
 
-if [ ! -r "$rootfs" -o ! -r "$kernel" -a ! "$nokernel" -o ! "$outfile" ]; then
-	echo "syntax: $0 [--no-kernel] [--uboot-env] rootfs [kernel] out [ubinize opts]"
+if [ ! -r "$rootfs" -o ! -r "$kernel" -a ! "$outfile" ]; then
+	echo "syntax: $0 [--uboot-env] [--kernel kernelimage] rootfs out [ubinize opts]"
 	exit 1
 fi