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

flashrom.c

Index: flashrom.c
diff --git a/flashrom.c b/flashrom.c
index 5b5f01c709372afa82347afd7618cdfd02af46e9..da09ded2c1e3df4fa3fef5a4a31f601777ca3f20 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -1898,9 +1898,11 @@ int doit(struct flashchip *flash, int force, char *filename, int read_it, int wr
 		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