X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tools%2Fmkimage.c;h=93d1c16c7ce0e8afa580ccfb84bc8e454b163f54;hb=52b1eaf93d6b55e1467f97b8eefdc2f8b6031c43;hp=a465fa38524ab4ef40e9b19581f05f5c647d2244;hpb=0b443dee6b0a74ac59fdbeda7b5a667c209a5948;p=platform%2Fkernel%2Fu-boot.git diff --git a/tools/mkimage.c b/tools/mkimage.c index a465fa3..93d1c16 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -13,10 +13,9 @@ #include static void copy_file(int, const char *, int); -static void usage(void); /* parameters initialized by core will be used by the image type code */ -struct image_tool_params params = { +static struct image_tool_params params = { .os = IH_OS_LINUX, .arch = IH_ARCH_PPC, .type = IH_TYPE_KERNEL, @@ -67,147 +66,209 @@ static void show_image_types(void) fprintf(stderr, "\n"); } +static void usage(const char *msg) +{ + fprintf(stderr, "Error: %s\n", msg); + fprintf(stderr, "Usage: %s -l image\n" + " -l ==> list image header information\n", + params.cmdname); + fprintf(stderr, + " %s [-x] -A arch -O os -T type -C comp -a addr -e ep -n name -d data_file[:data_file...] image\n" + " -A ==> set architecture to 'arch'\n" + " -O ==> set operating system to 'os'\n" + " -T ==> set image type to 'type'\n" + " -C ==> set compression type 'comp'\n" + " -a ==> set load address to 'addr' (hex)\n" + " -e ==> set entry point to 'ep' (hex)\n" + " -n ==> set image name to 'name'\n" + " -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|-f auto|-F] [-b [-b ]] fit-image\n" + " file is used with -f auto, it may occour multiple times.\n", + params.cmdname); + fprintf(stderr, + " -D => set all 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 ] [-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); + fprintf(stderr, "Use -T to see a list of available image types\n"); + + exit(EXIT_FAILURE); +} + +static int add_content(int type, const char *fname) +{ + struct content_info *cont; + + cont = calloc(1, sizeof(*cont)); + if (!cont) + return -1; + cont->type = type; + cont->fname = fname; + if (params.content_tail) + params.content_tail->next = cont; + else + params.content_head = cont; + params.content_tail = cont; + + return 0; +} + static void process_args(int argc, char **argv) { char *ptr; - - while (--argc > 0 && **++argv == '-') { - while (*++*argv) { - switch (**argv) { - case 'l': - params.lflag = 1; - break; - case 'A': - if ((--argc <= 0) || - (params.arch = - 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 = - genimg_get_comp_id (*++argv)) < 0) - usage(); - goto NXTARG; - case 'D': - if (--argc <= 0) - usage(); - params.dtc = *++argv; - goto NXTARG; - - case 'O': - if ((--argc <= 0) || - (params.os = - genimg_get_os_id (*++argv)) < 0) - usage(); - goto NXTARG; - case 'T': - params.type = -1; - if (--argc >= 0 && argv[1]) { - params.type = - genimg_get_type_id(*++argv); - } - if (params.type < 0) { - show_image_types(); - usage(); - } - goto NXTARG; - case 'a': - if (--argc <= 0) - usage(); - params.addr = strtoull(*++argv, &ptr, 16); - if (*ptr) { - fprintf (stderr, - "%s: invalid load address %s\n", - params.cmdname, *argv); - exit (EXIT_FAILURE); - } - goto NXTARG; - case 'd': - if (--argc <= 0) - usage(); - params.datafile = *++argv; - params.dflag = 1; - goto NXTARG; - case 'e': - if (--argc <= 0) - usage(); - params.ep = strtoull(*++argv, &ptr, 16); - if (*ptr) { - fprintf (stderr, - "%s: invalid entry point %s\n", - params.cmdname, *argv); - exit (EXIT_FAILURE); - } - params.eflag = 1; - goto NXTARG; - 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.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(); - /* - * This entry is for the second configuration - * file, if only one is not enough. - */ - params.imagename2 = *++argv; - goto NXTARG; - case 's': - params.skipcpy = 1; - break; - case 'v': - params.vflag++; - break; - case 'V': - printf("mkimage version %s\n", PLAIN_VERSION); - exit(EXIT_SUCCESS); - case 'x': - params.xflag++; - break; - default: - usage(); + int type = IH_TYPE_INVALID; + char *datafile = NULL; + int opt; + + while ((opt = getopt(argc, argv, + "a:A:b:cC:d:D:e:Ef:Fk:K:ln:O:rR:sT:vVx")) != -1) { + switch (opt) { + case 'a': + params.addr = strtoull(optarg, &ptr, 16); + if (*ptr) { + fprintf(stderr, "%s: invalid load address %s\n", + params.cmdname, optarg); + exit(EXIT_FAILURE); } + break; + case 'A': + params.arch = genimg_get_arch_id(optarg); + if (params.arch < 0) + usage("Invalid architecture"); + break; + case 'b': + if (add_content(IH_TYPE_FLATDT, optarg)) { + fprintf(stderr, + "%s: Out of memory adding content '%s'", + params.cmdname, optarg); + exit(EXIT_FAILURE); + } + break; + case 'c': + params.comment = optarg; + break; + case 'C': + params.comp = genimg_get_comp_id(optarg); + if (params.comp < 0) + usage("Invalid compression type"); + break; + case 'd': + params.datafile = optarg; + params.dflag = 1; + break; + case 'D': + params.dtc = optarg; + break; + case 'e': + params.ep = strtoull(optarg, &ptr, 16); + if (*ptr) { + fprintf(stderr, "%s: invalid entry point %s\n", + params.cmdname, optarg); + exit(EXIT_FAILURE); + } + params.eflag = 1; + break; + case 'E': + params.external_data = true; + break; + case 'f': + datafile = optarg; + params.auto_its = !strcmp(datafile, "auto"); + /* no break */ + case 'F': + /* + * The flattened image tree (FIT) format + * requires a flattened device tree image type + */ + params.fit_image_type = params.type; + params.type = IH_TYPE_FLATDT; + params.fflag = 1; + break; + case 'k': + params.keydir = optarg; + break; + case 'K': + params.keydest = optarg; + break; + case 'l': + params.lflag = 1; + break; + case 'n': + params.imagename = optarg; + break; + case 'O': + params.os = genimg_get_os_id(optarg); + if (params.os < 0) + usage("Invalid operating system"); + break; + case 'r': + params.require_keys = 1; + break; + case 'R': + /* + * This entry is for the second configuration + * file, if only one is not enough. + */ + params.imagename2 = optarg; + break; + case 's': + params.skipcpy = 1; + break; + case 'T': + type = genimg_get_type_id(optarg); + if (type < 0) { + show_image_types(); + usage("Invalid image type"); + } + break; + case 'v': + params.vflag++; + break; + case 'V': + printf("mkimage version %s\n", PLAIN_VERSION); + exit(EXIT_SUCCESS); + case 'x': + params.xflag++; + break; + default: + usage("Invalid option"); } -NXTARG: ; } - if (argc != 1) - usage(); - params.imagefile = *argv; + /* The last parameter is expected to be the imagefile */ + if (optind < argc) + params.imagefile = argv[optind]; + + /* + * For auto-generated FIT images we need to know the image type to put + * in the FIT, which is separate from the file's image type (which + * will always be IH_TYPE_FLATDT in this case). + */ + if (params.type == IH_TYPE_FLATDT) { + params.fit_image_type = type; + if (!params.auto_its) + params.datafile = datafile; + } else if (type != IH_TYPE_INVALID) { + params.type = type; + } + + if (!params.imagefile) + usage("Missing output filename"); } @@ -241,7 +302,7 @@ int main(int argc, char **argv) */ if (tparams->check_params) if (tparams->check_params (¶ms)) - usage(); + usage("Bad parameters for image type"); if (!params.eflag) { params.ep = params.addr; @@ -587,41 +648,3 @@ copy_file (int ifd, const char *datafile, int pad) (void) munmap((void *)ptr, sbuf.st_size); (void) close (dfd); } - -static void usage(void) -{ - fprintf (stderr, "Usage: %s -l image\n" - " -l ==> list image header information\n", - params.cmdname); - fprintf (stderr, " %s [-x] -A arch -O os -T type -C comp " - "-a addr -e ep -n name -d data_file[:data_file...] image\n" - " -A ==> set architecture to 'arch'\n" - " -O ==> set operating system to 'os'\n" - " -T ==> set image type to 'type'\n" - " -C ==> set compression type 'comp'\n" - " -a ==> set load address to 'addr' (hex)\n" - " -e ==> set entry point to 'ep' (hex)\n" - " -n ==> set image name to 'name'\n" - " -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|-F] fit-image\n", - params.cmdname); - fprintf(stderr, " -D => set all 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 ] [-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); - fprintf(stderr, "Use -T to see a list of available image types\n"); - - exit (EXIT_FAILURE); -}