X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2Ffirmware-utils%2Fsrc%2Fmkdniimg.c;h=7230f09d4921c2b5b75a9a388499a69075a3c40f;hb=42e7bfc7416c6648355f0896a91ff3398b3e93c7;hp=31b321012d3d1bac13e2ce50eaf6ec2df99f23c0;hpb=4bcc767170867495a170f365d58d98d7bf075618;p=openwrt-10.03%2F.git

diff --git a/tools/firmware-utils/src/mkdniimg.c b/tools/firmware-utils/src/mkdniimg.c
index 31b321012..7230f09d4 100644
--- a/tools/firmware-utils/src/mkdniimg.c
+++ b/tools/firmware-utils/src/mkdniimg.c
@@ -27,7 +27,8 @@ static char *ifname;
 static char *progname;
 static char *ofname;
 static char *version = "1.00.00";
-static char *region ="NA";
+static char *region = "";
+static char *hd_id;
 
 static char *board_id;
 /*
@@ -60,6 +61,7 @@ void usage(int status)
 "  -o <file>       write output to the file <file>\n"
 "  -v <version>    set image version to <version>\n"
 "  -r <region>     set image region to <region>\n"
+"  -H <hd_id>      set image hardware id to <hd_id>\n"
 "  -h              show this screen\n"
 	);
 
@@ -73,7 +75,7 @@ int main(int argc, char *argv[])
 	int err;
 	struct stat st;
 	char *buf;
-	int i;
+	int pos, rem, i;
 	uint8_t csum;
 
 	FILE *outfile, *infile;
@@ -83,7 +85,7 @@ int main(int argc, char *argv[])
 	while ( 1 ) {
 		int c;
 
-		c = getopt(argc, argv, "B:i:o:v:r:h");
+		c = getopt(argc, argv, "B:i:o:v:r:H:h");
 		if (c == -1)
 			break;
 
@@ -103,6 +105,9 @@ int main(int argc, char *argv[])
 		case 'r':
 			region = optarg;
 			break;
+		case 'H':
+			hd_id = optarg;
+			break;
 		case 'h':
 			usage(EXIT_SUCCESS);
 			break;
@@ -141,8 +146,12 @@ int main(int argc, char *argv[])
 	}
 
 	memset(buf, 0, DNI_HDR_LEN);
-	snprintf(buf, DNI_HDR_LEN, "device:%s\nversion:V%s\nregion:%s\n",
-		 board_id, version, region);
+	pos = snprintf(buf, DNI_HDR_LEN, "device:%s\nversion:V%s\nregion:%s\n",
+		       board_id, version, region);
+	rem = DNI_HDR_LEN - pos;
+	if (pos >= 0 && rem > 1 && hd_id) {
+		snprintf(buf + pos, rem, "hd_id:%s\n", hd_id);
+	}
 
 	infile = fopen(ifname, "r");
 	if (infile == NULL) {