[FLASHROM] Fix the help, and print a message when nothing happens

The help implied that writes happen by default, which they don't.  Fix
the text, and say something when we dont specify any commands.

Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2820 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/util/flashrom/flashrom.c b/util/flashrom/flashrom.c
index 36462a4bc9b804a7a4d9067cb2b02956620f5925..7587ac79b8b9f4e767945ce44a0bf10a368c5d6c 100644 (file)
--- a/util/flashrom/flashrom.c
+++ b/util/flashrom/flashrom.c
@@ -195,8 +195,7 @@ void usage(const char *name)
        printf("       [-e exclude_end] [-m vendor:part] [-l file.layout] [-i imagename] [file]\n");
        printf
            ("   -r | --read:                    read flash and save into file\n"
-            "   -w | --write:                   write file into flash (default when\n"
-            "                                   file is specified)\n"
+            "   -w | --write:                   write file into flash\n"
             "   -v | --verify:                  verify flash against file\n"
             "   -E | --erase:                   erase flash device\n"
             "   -V | --verbose:                 more verbose output\n"
@@ -366,15 +365,22 @@ int main(int argc, char *argv[])
 
        if ((flash = probe_flash(flashchips)) == NULL) {
                printf("No EEPROM/flash device found.\n");
+               // FIXME: flash writes stay enabled!
                exit(1);
        }
 
        printf("Flash part is %s (%d KB)\n", flash->name, flash->total_size);
 
+       if (!(read_it | write_it | verify_it | erase_it)) {
+               printf("No operations were specified.\n");
+               // FIXME: flash writes stay enabled!
+               exit(1);
+       }
+
        if (!filename && !erase_it) {
-               // FIXME: Do we really want this feature implicitly?
-               printf("OK, only ENABLING flash write, but NOT FLASHING.\n");
-               return 0;
+               printf("Error: No filename specified.\n");
+               // FIXME: flash writes stay enabled!
+               exit(1);
        }
 
        size = flash->total_size * 1024;