diff options
| author | Joel Stanley <joel@jms.id.au> | 2020-12-08 14:42:15 +1030 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-22 16:17:53 -0500 |
| commit | 603e26f76346a36594eda78daa2b7d95ce96b497 (patch) | |
| tree | 32f92d325af649c2e2b2a62b1db5c8cf2882a541 /tools | |
| parent | 93af80f3e8fb6fcbfb851a6dc384999a61ddaedb (diff) | |
| download | u-boot-603e26f76346a36594eda78daa2b7d95ce96b497.tar.gz u-boot-603e26f76346a36594eda78daa2b7d95ce96b497.tar.xz u-boot-603e26f76346a36594eda78daa2b7d95ce96b497.zip | |
mkimage: Move padding commands outside of FIT_SIGNATURE
These commands were disabled when CONFIG_FIT_SIGNATURE is disabled, but
they do not depend on crypto support so they can be unconditionally
enabled.
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mkimage.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/mkimage.c b/tools/mkimage.c index e78608293e..68d5206cb4 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -94,18 +94,18 @@ static void usage(const char *msg) " -x ==> set XIP (execute in place)\n", params.cmdname); fprintf(stderr, - " %s [-D dtc_options] [-f fit-image.its|-f auto|-F] [-b <dtb> [-b <dtb>]] [-i <ramdisk.cpio.gz>] fit-image\n" + " %s [-D dtc_options] [-f fit-image.its|-f auto|-F] [-b <dtb> [-b <dtb>]] [-E] [-B size] [-i <ramdisk.cpio.gz>] fit-image\n" " <dtb> file is used with -f auto, it may occur multiple times.\n", params.cmdname); fprintf(stderr, " -D => set all options for device tree compiler\n" " -f => input filename for FIT source\n" - " -i => input filename for ramdisk file\n"); + " -i => input filename for ramdisk file\n" + " -E => place data outside of the FIT structure\n" + " -B => align size in hex for FIT structure and header\n"); #ifdef CONFIG_FIT_SIGNATURE fprintf(stderr, - "Signing / verified boot options: [-E] [-B size] [-k keydir] [-K dtb] [ -c <comment>] [-p addr] [-r] [-N engine]\n" - " -E => place data outside of the FIT structure\n" - " -B => align size in hex for FIT structure and header\n" + "Signing / verified boot options: [-k keydir] [-K dtb] [ -c <comment>] [-p addr] [-r] [-N engine]\n" " -k => set directory containing private keys\n" " -K => write public keys to this .dtb file\n" " -c => add comment in signature node\n" @@ -142,6 +142,7 @@ static int add_content(int type, const char *fname) return 0; } +#define OPT_STRING "a:A:b:B:c:C:d:D:e:Ef:Fk:i:K:ln:N:p:O:rR:qstT:vVx" static void process_args(int argc, char **argv) { char *ptr; |