diff options
Diffstat (limited to 'tools/mkimage.c')
| -rw-r--r-- | tools/mkimage.c | 36 | 
1 files changed, 34 insertions, 2 deletions
| diff --git a/tools/mkimage.c b/tools/mkimage.c index e43b09f76..d312844e9 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -183,6 +183,11 @@ main (int argc, char **argv)  					genimg_get_arch_id (*++argv)) < 0)  					usage ();  				goto NXTARG; +			case 'c': +				if (--argc <= 0) +					usage(); +				params.comment = *++argv; +				goto NXTARG;  			case 'C':  				if ((--argc <= 0) ||  					(params.comp = @@ -240,19 +245,34 @@ main (int argc, char **argv)  			case 'f':  				if (--argc <= 0)  					usage (); +				params.datafile = *++argv; +				/* no break */ +			case 'F':  				/*  				 * The flattened image tree (FIT) format  				 * requires a flattened device tree image type  				 */  				params.type = IH_TYPE_FLATDT; -				params.datafile = *++argv;  				params.fflag = 1;  				goto NXTARG; +			case 'k': +				if (--argc <= 0) +					usage(); +				params.keydir = *++argv; +				goto NXTARG; +			case 'K': +				if (--argc <= 0) +					usage(); +				params.keydest = *++argv; +				goto NXTARG;  			case 'n':  				if (--argc <= 0)  					usage ();  				params.imagename = *++argv;  				goto NXTARG; +			case 'r': +				params.require_keys = 1; +				break;  			case 'R':  				if (--argc <= 0)  					usage(); @@ -623,8 +643,20 @@ usage ()  			 "          -d ==> use image data from 'datafile'\n"  			 "          -x ==> set XIP (execute in place)\n",  		params.cmdname); -	fprintf (stderr, "       %s [-D dtc_options] -f fit-image.its fit-image\n", +	fprintf(stderr, "       %s [-D dtc_options] [-f fit-image.its|-F] fit-image\n",  		params.cmdname); +	fprintf(stderr, "          -D => set options for device tree compiler\n" +			"          -f => input filename for FIT source\n"); +#ifdef CONFIG_FIT_SIGNATURE +	fprintf(stderr, "Signing / verified boot options: [-k keydir] [-K dtb] [ -c <comment>] [-r]\n" +			"          -k => set directory containing private keys\n" +			"          -K => write public keys to this .dtb file\n" +			"          -c => add comment in signature node\n" +			"          -F => re-sign existing FIT image\n" +			"          -r => mark keys used as 'required' in dtb\n"); +#else +	fprintf(stderr, "Signing / verified boot not supported (CONFIG_FIT_SIGNATURE undefined)\n"); +#endif  	fprintf (stderr, "       %s -V ==> print version information and exit\n",  		params.cmdname); |