From 8d57a958f90503ce7dc576f7c2168c6d31b14e60 Mon Sep 17 00:00:00 2001 From: jow Date: Sun, 13 Nov 2011 20:29:04 +0000 Subject: [PATCH] [backfire] tools: merge r27052 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@29046 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- tools/firmware-utils/src/mkdniimg.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/firmware-utils/src/mkdniimg.c b/tools/firmware-utils/src/mkdniimg.c index 48e1727c8..7230f09d4 100644 --- a/tools/firmware-utils/src/mkdniimg.c +++ b/tools/firmware-utils/src/mkdniimg.c @@ -28,6 +28,7 @@ static char *progname; static char *ofname; static char *version = "1.00.00"; static char *region = ""; +static char *hd_id; static char *board_id; /* @@ -60,6 +61,7 @@ void usage(int status) " -o write output to the file \n" " -v set image version to \n" " -r set image region to \n" +" -H set image hardware id to \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) { -- 2.35.1