diff options
| author | Simon Glass <sjg@chromium.org> | 2013-06-13 15:10:03 -0700 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-06-26 10:18:56 -0400 | 
| commit | 80e4df8ac661ada5308f3bffebe4e6fae1f8e990 (patch) | |
| tree | bb12060490a0747af1db2aa46eeb0532bb790397 /tools/mkimage.c | |
| parent | 19c402afa2e1190f596f35a84ac049b10d814f1f (diff) | |
| download | olio-uboot-2014.01-80e4df8ac661ada5308f3bffebe4e6fae1f8e990.tar.xz olio-uboot-2014.01-80e4df8ac661ada5308f3bffebe4e6fae1f8e990.zip | |
mkimage: Add -k option to specify key directory
Keys required for signing images will be in a specific directory. Add a
-k option to specify that directory.
Also update the mkimage man page with this information and a clearer list
of available commands.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Marek Vasut <marex@denx.de> (v1)
Diffstat (limited to 'tools/mkimage.c')
| -rw-r--r-- | tools/mkimage.c | 15 | 
1 files changed, 14 insertions, 1 deletions
| diff --git a/tools/mkimage.c b/tools/mkimage.c index e43b09f76..def7df250 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -248,6 +248,11 @@ main (int argc, char **argv)  				params.datafile = *++argv;  				params.fflag = 1;  				goto NXTARG; +			case 'k': +				if (--argc <= 0) +					usage(); +				params.keydir = *++argv; +				goto NXTARG;  			case 'n':  				if (--argc <= 0)  					usage (); @@ -623,8 +628,16 @@ 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 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]\n" +			"          -k => set directory containing private keys\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); |