X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=scripts%2Fmkits.sh;h=32a978e18d1b6f769775acac269964998c283205;hb=b6946542f85014096c08f58c3c0acbbfe623a734;hp=8857996eba222fce44846242b13e6d66e456f267;hpb=d9a0a8c78f9ac42f7976aeb4152094213a4d8381;p=openwrt%2F.git

diff --git a/scripts/mkits.sh b/scripts/mkits.sh
index 8857996eba..32a978e18d 100755
--- a/scripts/mkits.sh
+++ b/scripts/mkits.sh
@@ -15,10 +15,11 @@
 #
 
 usage() {
-	echo "Usage: `basename $0` -A arch -C comp -a addr -e entry" \
+	echo "Usage: $(basename $0) -A arch -C comp -a addr -e entry" \
 		"-v version -k kernel [-D name -d dtb] -o its_file"
 	echo -e "\t-A ==> set architecture to 'arch'"
 	echo -e "\t-C ==> set compression type 'comp'"
+	echo -e "\t-c ==> set config name 'config'"
 	echo -e "\t-a ==> set load address to 'addr' (hex)"
 	echo -e "\t-e ==> set entry point to 'entry' (hex)"
 	echo -e "\t-v ==> set kernel version to 'version'"
@@ -29,11 +30,12 @@ usage() {
 	exit 1
 }
 
-while getopts ":A:a:C:D:d:e:k:o:v:" OPTION
+while getopts ":A:a:c:C:D:d:e:k:o:v:" OPTION
 do
 	case $OPTION in
 		A ) ARCH=$OPTARG;;
 		a ) LOAD_ADDR=$OPTARG;;
+		c ) CONFIG=$OPTARG;;
 		C ) COMPRESS=$OPTARG;;
 		D ) DEVICE=$OPTARG;;
 		d ) DTB=$OPTARG;;
@@ -49,15 +51,15 @@ done
 # Make sure user entered all required parameters
 if [ -z "${ARCH}" ] || [ -z "${COMPRESS}" ] || [ -z "${LOAD_ADDR}" ] || \
 	[ -z "${ENTRY_ADDR}" ] || [ -z "${VERSION}" ] || [ -z "${KERNEL}" ] || \
-	[ -z "${OUTPUT}" ]; then
+	[ -z "${OUTPUT}" ] || [ -z "${CONFIG}" ]; then
 	usage
 fi
 
-ARCH_UPPER=`echo $ARCH | tr '[:lower:]' '[:upper:]'`
+ARCH_UPPER=$(echo $ARCH | tr '[:lower:]' '[:upper:]')
 
 # Conditionally create fdt information
 if [ -n "${DTB}" ]; then
-	FDT="
+	FDT_NODE="
 		fdt@1 {
 			description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\";
 			data = /incbin/(\"${DTB}\");
@@ -72,6 +74,7 @@ if [ -n "${DTB}" ]; then
 			};
 		};
 "
+	FDT_PROP="fdt = \"fdt@1\";"
 fi
 
 # Create a default, fully populated DTS file
@@ -98,17 +101,15 @@ DATA="/dts-v1/;
 				algo = \"sha1\";
 			};
 		};
-
-${FDT}
-
+${FDT_NODE}
 	};
 
 	configurations {
-		default = \"config@1\";
-		config@1 {
+		default = \"${CONFIG}\";
+		${CONFIG} {
 			description = \"OpenWrt\";
 			kernel = \"kernel@1\";
-			fdt = \"fdt@1\";
+			${FDT_PROP}
 		};
 	};
 };"