ignore fmap if we're erasing the ROM with -E

flashrom.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 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 1880 matching lines @@
                 goto out_nofree;
         }
 
         /* Given the existence of read locks, we want to unlock for read,
          * erase and write.
          */
         if (flash->unlock)
                 flash->unlock(flash);
 
         /* add entries for regions specified in flashmap */
-        if (add_fmap_entries(flash) < 0) {
-                ret = 1;
-                goto out_nofree;
+        if (!erase_it) {

[Stefan Reinauer, 2011/03/25 22:35:32]

should this be if (read_it || write_it) 
Does it make sense to parse fmaps for verify_it?

[dhendrix, 2011/03/25 22:50:44]

Yes, it makes sense to verify using fmap data. The reason for this is because
users might want to verify only regions marked as "static".

This is most useful if your ROM image has a region dedicated to event logging or
other data which is expected to change at run-time. In this case, you'd mark the
regions you wish to include in verification as "static" so that benign/expected
changes at run-time do not cause verification to fail.

Should I change this to:
if (read_it || write_it || verify_it)

?

+                if (add_fmap_entries(flash) < 0) {
+                        ret = 1;
+                        goto out_nofree;
+                }
         }
 
         /* mark entries included using -i argument as "included" if they are
            found in the master rom_entries list */
         if (process_include_args() < 0) {
                 ret = 1;
                 goto out_nofree;
         }
 
         if (read_it) {
@@ skipping 94 matching lines @@
 out_nofree:
         chip_restore(); /* must be done before programmer_shutdown() */
         /*
          * programmer_shutdown() call is moved to cli_mfg() in chromium os
          * tree. This is because some operations, such as write protection,
          * requires programmer_shutdown() but does not call doit().
          */
 //      programmer_shutdown();
         return ret;
 }