tools/mtd-utils: update to version 2.0.2
This version now uses autotools to configure the build system. They are also using the newly added zlib package. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
		| @@ -1,6 +1,6 @@ | ||||
| --- a/ubi-utils/ubinize.c | ||||
| +++ b/ubi-utils/ubinize.c | ||||
| @@ -70,6 +70,8 @@ static const char optionsstr[] = | ||||
| @@ -60,6 +60,8 @@ static const char optionsstr[] = | ||||
|  "                             (default is 1)\n" | ||||
|  "-Q, --image-seq=<num>        32-bit UBI image sequence number to use\n" | ||||
|  "                             (by default a random number is picked)\n" | ||||
| @@ -8,17 +8,8 @@ | ||||
| +"                             output image\n" | ||||
|  "-v, --verbose                be verbose\n" | ||||
|  "-h, --help                   print help message\n" | ||||
|  "-V, --version                print program version"; | ||||
| @@ -79,7 +81,7 @@ static const char usage[] = | ||||
|  "\t\t[-x <num>] [-Q <num>] [-v] [-h] [-V] [--output=<filename>] [--peb-size=<bytes>]\n" | ||||
|  "\t\t[--min-io-size=<bytes>] [--sub-page-size=<bytes>] [--vid-hdr-offset=<num>]\n" | ||||
|  "\t\t[--erase-counter=<num>] [--ubi-ver=<num>] [--image-seq=<num>] [--verbose] [--help]\n" | ||||
| -"\t\t[--version] ini-file\n" | ||||
| +"\t\t[--eof-markers=<num>] [--version] ini-file\n" | ||||
|  "Example: " PROGRAM_NAME " -o ubi.img -p 16KiB -m 512 -s 256 cfg.ini - create UBI image\n" | ||||
|  "         'ubi.img' as described by configuration file 'cfg.ini'"; | ||||
|   | ||||
| @@ -125,6 +127,7 @@ static const struct option long_options[ | ||||
|  "-V, --version                print program version\n\n"; | ||||
| @@ -79,6 +81,7 @@ static const struct option long_options[ | ||||
|  	{ .name = "erase-counter",  .has_arg = 1, .flag = NULL, .val = 'e' }, | ||||
|  	{ .name = "ubi-ver",        .has_arg = 1, .flag = NULL, .val = 'x' }, | ||||
|  	{ .name = "image-seq",      .has_arg = 1, .flag = NULL, .val = 'Q' }, | ||||
| @@ -26,7 +17,7 @@ | ||||
|  	{ .name = "verbose",        .has_arg = 0, .flag = NULL, .val = 'v' }, | ||||
|  	{ .name = "help",           .has_arg = 0, .flag = NULL, .val = 'h' }, | ||||
|  	{ .name = "version",        .has_arg = 0, .flag = NULL, .val = 'V' }, | ||||
| @@ -144,6 +147,7 @@ struct args { | ||||
| @@ -98,6 +101,7 @@ struct args { | ||||
|  	uint32_t image_seq; | ||||
|  	int verbose; | ||||
|  	dictionary *dict; | ||||
| @@ -34,7 +25,7 @@ | ||||
|  }; | ||||
|   | ||||
|  static struct args args = { | ||||
| @@ -162,7 +166,7 @@ static int parse_opt(int argc, char * co | ||||
| @@ -116,7 +120,7 @@ static int parse_opt(int argc, char * co | ||||
|  		int key, error = 0; | ||||
|  		unsigned long int image_seq; | ||||
|   | ||||
| @@ -43,7 +34,7 @@ | ||||
|  		if (key == -1) | ||||
|  			break; | ||||
|   | ||||
| @@ -222,6 +226,12 @@ static int parse_opt(int argc, char * co | ||||
| @@ -176,6 +180,12 @@ static int parse_opt(int argc, char * co | ||||
|  			args.image_seq = image_seq; | ||||
|  			break; | ||||
|   | ||||
| @@ -56,7 +47,7 @@ | ||||
|  		case 'v': | ||||
|  			args.verbose = 1; | ||||
|  			break; | ||||
| @@ -599,6 +609,18 @@ int main(int argc, char * const argv[]) | ||||
| @@ -559,6 +569,18 @@ int main(int argc, char * const argv[]) | ||||
|  			printf("\n"); | ||||
|  	} | ||||
|   | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Hauke Mehrtens
					Hauke Mehrtens