Supports --ignore-fmap argument to skip parsing fmap structure on flash.

cli_mfg.c

 /*
  * This file is part of the flashrom project.
  *
  * Copyright (C) 2000 Silicon Integrated System Corporation
  * Copyright (C) 2004 Tyan Corp <yhlu@tyan.com>
  * Copyright (C) 2005-2008 coresystems GmbH
  * Copyright (C) 2008,2009,2010 Carl-Daniel Hailfinger
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ skipping 19 matching lines @@
 #include <getopt.h>
 #include <errno.h>
 #include "big_lock.h"
 #include "flash.h"
 #include "flashchips.h"
 #include "programmer.h"
 #include "writeprotect.h"
 
 #define LOCK_TIMEOUT_SECS       30
 
+/* This variable is shared with doit() in flashrom.c */
+int set_ignore_fmap = 0;
+
 void cli_mfg_usage(const char *name)
 {
         const char *pname;
         int pnamelen;
         int remaining = 0;
         enum programmer p;
 
         printf("Usage: %s [-n] [-V] [-f] [-h|-R|-L|"
 #if CONFIG_PRINT_WIKI == 1
                  "-z|"
@@ skipping 36 matching lines @@
                  "from flash layout.\n"
                "                                     the content are included "
                  "in <file> if specified.\n"
                "   -L | --list-supported             print supported devices\n"
 #if CONFIG_PRINT_WIKI == 1
                "   -z | --list-supported-wiki        print supported devices "
                  "in wiki syntax\n"
 #endif
                "   -p | --programmer <name>[:<param>] specify the programmer "
                  "device"
+               "   --ignore-fmap                     don't try to parse the "
+                 "fmap structure on the flash\n"
                  );
 
         for (p = 0; p < PROGRAMMER_INVALID; p++) {
                 pname = programmer_table[p].name;
                 pnamelen = strlen(pname);
                 if (remaining - pnamelen - 2 < 0) {
                         printf("\n                                     ");
                         remaining = 43;
                 } else {
                         printf(" ");
@@ skipping 37 matching lines @@
 }
 
 enum LONGOPT_RETURN_VALUES {
         /* start after ASCII chars */
         LONGOPT_GET_SIZE = 256,
         LONGOPT_WP_STATUS,
         LONGOPT_WP_SET_RANGE,
         LONGOPT_WP_ENABLE,
         LONGOPT_WP_DISABLE,
         LONGOPT_WP_LIST,
+        LONGOPT_IGNORE_FMAP,
 };
 
 int cli_mfg(int argc, char *argv[])
 {
         unsigned long size;
         /* Probe for up to three flash chips. */
         struct flashchip *flash, *flashes[3];
         const char *name;
         int namelen;
         int opt;
@@ skipping 27 matching lines @@
                 {"list-supported-wiki", 0, 0, 'z'},
                 {"programmer", 1, 0, 'p'},
                 {"help", 0, 0, 'h'},
                 {"version", 0, 0, 'R'},
                 {"get-size", 0, 0, LONGOPT_GET_SIZE},
                 {"wp-status", 0, 0, LONGOPT_WP_STATUS},
                 {"wp-range", 0, 0, LONGOPT_WP_SET_RANGE},
                 {"wp-enable", 0, 0, LONGOPT_WP_ENABLE},
                 {"wp-disable", 0, 0, LONGOPT_WP_DISABLE},
                 {"wp-list", 0, 0, LONGOPT_WP_LIST},
+                {"ignore-fmap", 0, 0, LONGOPT_IGNORE_FMAP},
                 {0, 0, 0, 0}
         };
 
         char *filename = NULL;
 
         char *tempstr = NULL;
         char *pparam = NULL;
 
         print_version();
 
@@ skipping 169 matching lines @@
                         break;
                 case LONGOPT_WP_SET_RANGE:
                         set_wp_range = 1;
                         break;
                 case LONGOPT_WP_ENABLE:
                         set_wp_enable = 1;
                         break;
                 case LONGOPT_WP_DISABLE:
                         set_wp_disable = 1;
                         break;
+                case LONGOPT_IGNORE_FMAP:
+                        set_ignore_fmap = 1;
+                        break;
                 default:
                         cli_mfg_abort_usage(argv[0]);
                         break;
                 }
         }
 
         /* FIXME: Print the actions flashrom will take. */
 
         if (list_supported) {
                 print_supported();
@@ skipping 197 matching lines @@
 
         msg_ginfo("%s\n", rc ? "FAILED" : "SUCCESS");
 cli_mfg_silent_exit:
         programmer_shutdown();  /* must be done after chip_restore() */
 cli_mfg_release_lock_exit:
 #if USE_BIG_LOCK == 1
         release_big_lock();
 #endif
         return rc;
 }