diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2016-11-04 14:22:15 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-06 07:33:42 -0500 |
| commit | 0f7c6cdc8143d6cf0577a84bf27bdaadd6229ff4 (patch) | |
| tree | 5d3ca7131085c25be9ced0bfff7fb9db1709a607 /tools/mkimage.c | |
| parent | baade496d18d9fd80797c09031687ff0af53f69d (diff) | |
| download | u-boot-0f7c6cdc8143d6cf0577a84bf27bdaadd6229ff4.zip u-boot-0f7c6cdc8143d6cf0577a84bf27bdaadd6229ff4.tar.gz u-boot-0f7c6cdc8143d6cf0577a84bf27bdaadd6229ff4.tar.bz2 | |
mkimage: Allow including a ramdisk in FIT auto mode
Adds -i option that allows specifying a ramdisk file to be added to the
FIT image when we are using the automatic FIT mode (no ITS file).
This makes adding Depthcharge support to LAVA much more convenient, as
no additional configuration files need to be kept around in the machine
that dispatches jobs to the boards.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Matt Hart <matthew.hart@linaro.org>
Cc: Neil Williams <codehelp@debian.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/mkimage.c')
| -rw-r--r-- | tools/mkimage.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/mkimage.c b/tools/mkimage.c index 0c6dba8..49d5d1e 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -88,12 +88,13 @@ 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>]] fit-image\n" + " %s [-D dtc_options] [-f fit-image.its|-f auto|-F] [-b <dtb> [-b <dtb>]] [-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"); + " -f => input filename for FIT source\n" + " -i => input filename for ramdisk file\n"); #ifdef CONFIG_FIT_SIGNATURE fprintf(stderr, "Signing / verified boot options: [-E] [-k keydir] [-K dtb] [ -c <comment>] [-p addr] [-r]\n" @@ -141,7 +142,7 @@ static void process_args(int argc, char **argv) int opt; while ((opt = getopt(argc, argv, - "a:A:b:c:C:d:D:e:Ef:Fk:K:ln:p:O:rR:qsT:vVx")) != -1) { + "a:A:b:c:C:d:D:e:Ef:Fk:i:K:ln:p:O:rR:qsT:vVx")) != -1) { switch (opt) { case 'a': params.addr = strtoull(optarg, &ptr, 16); @@ -207,6 +208,9 @@ static void process_args(int argc, char **argv) params.type = IH_TYPE_FLATDT; params.fflag = 1; break; + case 'i': + params.fit_ramdisk = optarg; + break; case 'k': params.keydir = optarg; break; |