diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-05-31 22:53:24 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-05-31 22:53:24 +0000 |
| commit | 1d6170ac7216529669d28ae6cd58ed73beff7109 (patch) | |
| tree | 9ec82871ea631e24f27e345d312b7ba7f7d5d140 | |
| parent | fc50c6a3b68a37b8a07cf29bb89fcd882f9f1833 (diff) | |
tools/firmware-utils: add support for hd_id tag into mkdniimg
Signed-off-by: Mark Mentovai <mark@moxienet.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27052 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | tools/firmware-utils/src/mkdniimg.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/tools/firmware-utils/src/mkdniimg.c b/tools/firmware-utils/src/mkdniimg.c index 48e1727c86..7230f09d49 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 <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) { |