tools/mtd-utils/patches/201-ubinize-add-terminator-support.patch

   1 --- a/ubi-utils/src/ubinize.c
   2 +++ b/ubi-utils/src/ubinize.c
   3 @@ -70,6 +70,8 @@ static const char optionsstr[] =
   4  "                             (default is 1)\n"
   5  "-Q, --image-seq=<num>        32-bit UBI image sequence number to use\n"
   6  "                             (by default a random number is picked)\n"
   7 +"-E, --eof-markers=<num>      number of eof-markers to put at the end of the\n"
   8 +"                             output image\n"
   9  "-v, --verbose                be verbose\n"
  10  "-h, --help                   print help message\n"
  11  "-V, --version                print program version";
  12 @@ -79,7 +81,7 @@ static const char usage[] =
  13  "\t\t[-x <num>] [-Q <num>] [-v] [-h] [-V] [--output=<filename>] [--peb-size=<bytes>]\n"
  14  "\t\t[--min-io-size=<bytes>] [--sub-page-size=<bytes>] [--vid-hdr-offset=<num>]\n"
  15  "\t\t[--erase-counter=<num>] [--ubi-ver=<num>] [--image-seq=<num>] [--verbose] [--help]\n"
  16 -"\t\t[--version] ini-file\n"
  17 +"\t\t[--eof-markers=<num>] [--version] ini-file\n"
  18  "Example: " PROGRAM_NAME " -o ubi.img -p 16KiB -m 512 -s 256 cfg.ini - create UBI image\n"
  19  "         'ubi.img' as described by configuration file 'cfg.ini'";
  20
  21 @@ -125,6 +127,7 @@ static const struct option long_options[
  22         { .name = "erase-counter",  .has_arg = 1, .flag = NULL, .val = 'e' },
  23         { .name = "ubi-ver",        .has_arg = 1, .flag = NULL, .val = 'x' },
  24         { .name = "image-seq",      .has_arg = 1, .flag = NULL, .val = 'Q' },
  25 +       { .name = "eof-markers",    .has_arg = 1, .flag = NULL, .val = 'E' },
  26         { .name = "verbose",        .has_arg = 0, .flag = NULL, .val = 'v' },
  27         { .name = "help",           .has_arg = 0, .flag = NULL, .val = 'h' },
  28         { .name = "version",        .has_arg = 0, .flag = NULL, .val = 'V' },
  29 @@ -144,6 +147,7 @@ struct args {
  30         uint32_t image_seq;
  31         int verbose;
  32         dictionary *dict;
  33 +       int eof_markers;
  34  };
  35
  36  static struct args args = {
  37 @@ -162,7 +166,7 @@ static int parse_opt(int argc, char * co
  38                 int key, error = 0;
  39                 unsigned long int image_seq;
  40
  41 -               key = getopt_long(argc, argv, "o:p:m:s:O:e:x:Q:vhV", long_options, NULL);
  42 +               key = getopt_long(argc, argv, "o:p:m:s:O:e:x:Q:E:vhV", long_options, NULL);
  43                 if (key == -1)
  44                         break;
  45
  46 @@ -222,6 +226,12 @@ static int parse_opt(int argc, char * co
  47                         args.image_seq = image_seq;
  48                         break;
  49
  50 +               case 'E':
  51 +                       args.eof_markers = simple_strtoul(optarg, &error);
  52 +                       if (error)
  53 +                               return errmsg("bad number of eof-markers: \"%s\"", optarg);
  54 +                       break;
  55 +
  56                 case 'v':
  57                         args.verbose = 1;
  58                         break;
  59 @@ -599,6 +609,18 @@ int main(int argc, char * const argv[])
  60                         printf("\n");
  61         }
  62
  63 +       if (args.eof_markers) {
  64 +               verbose(args.verbose, "writing %d eof-marker blocks",
  65 +                       args.eof_markers);
  66 +
  67 +               err = ubigen_write_eof_markers(&ui, args.ec, args.eof_markers,
  68 +                                              args.out_fd);
  69 +               if (err) {
  70 +                       errmsg("cannot write eof-marker blocks");
  71 +                       goto out_free;
  72 +               }
  73 +       }
  74 +
  75         verbose(args.verbose, "writing layout volume");
  76
  77         err = ubigen_write_layout_vol(&ui, 0, 1, args.ec, args.ec, vtbl, args.out_fd);