My implementation does not defer the processing until doit(), but after the
argument parsing loop only (doit() should not contain argument checks).

This allows to specify -i and -l parameters in any order.

I don't like the output in error cases much, any ideas?
example of a good run:
flashrom -p dummy:emulate=SST25VF032B -i normal -w ../testimages/4096kB.rand.img  -l test.layout -i gfxrom -i fallback
flashrom v0.9.4-r1396 on Linux 2.6.35-30-generic (x86_64), built with libpci 3.1.7, GCC 4.4.5, little endian
flashrom is free software, get the source code at http://www.flashrom.org

Using region(s): "normal", "gfxrom", "fallback".
Calibrating delay loop... OK.
Found SST flash chip "SST25VF032B" (4096 kB, SPI) on dummy.
Reading old flash chip contents... done.
Erasing and writing flash chip... Erase/write done.
Verifying flash... VERIFIED.

example of a semi-good run:
flashrom -p dummy:emulate=SST25VF032B -i normal -w ../testimages/4096kB.rand.img  -l test.layout -i gfxrom -i fallback
flashrom v0.9.4-r1396 on Linux 2.6.35-30-generic (x86_64), built with libpci 3.1.7, GCC 4.4.5, little endian
flashrom is free software, get the source code at http://www.flashrom.org

Maximum number of ROM images (4) in layout file reached before end of layout file.
Ignoring the rest of the layout file.

example of a faulty run:
flashrom -p dummy:emulate=SST25VF032B -i normal -w ../testimages/4096kB.rand.img  -l test.layout -i gfxrom -i fallback -i bios
flashrom v0.9.4-r1396 on Linux 2.6.35-30-generic (x86_64), built with libpci 3.1.7, GCC 4.4.5, little endian
flashrom is free software, get the source code at http://www.flashrom.org

Maximum number of ROM images (4) in layout file reached before end of layout file.
Ignoring the rest of the layout file.
Using region(s): "normal", "gfxrom", "fallback"Invalid region specified: "bios"

Please run "flashrom --help" for usage info.
Signed-off-by: Stefan Tauner <stefan.tauner@student.tuwien.ac.at>
---
 cli_classic.c |   11 ++++-----
 flash.h       |    2 +
 layout.c      |   68 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/cli_classic.c b/cli_classic.c
index 36fe9ad..e44ea86 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -233,14 +233,9 @@ int cli_classic(int argc, char *argv[])
                               cli_classic_abort_usage();
                       break;
               case 'i':
-                       /* FIXME: -l has to be specified before -i. */
                       tempstr = strdup(optarg);
-                       if (find_romentry(tempstr) < 0) {
-                               fprintf(stderr, "Error: image %s not found in "
-                                       "layout file or -i specified before "
-                                       "-l\n", tempstr);
+                       if (register_include_arg(tempstr) < 0)
                               cli_classic_abort_usage();
-                       }
                       break;
               case 'L':
                       if (++operation_specified > 1) {
@@ -325,6 +320,10 @@ int cli_classic(int argc, char *argv[])
               cli_classic_abort_usage();
       }

+       if (process_include_args() < 0) {
+               cli_classic_abort_usage();
+       }
+
       /* FIXME: Print the actions flashrom will take. */

       if (list_supported) {
diff --git a/flash.h b/flash.h
index 5b49e9d..0848255 100644
--- a/flash.h
+++ b/flash.h
@@ -251,6 +251,8 @@ int print(int type, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
 int cli_classic(int argc, char *argv[]);

 /* layout.c */
+int register_include_arg(char *name);
+int process_include_args(void);
 int read_romlayout(char *name);
 int find_romentry(char *name);
 int handle_romentries(struct flashchip *flash, uint8_t *oldcontents, uint8_t *newcontents);
diff --git a/layout.c b/layout.c
index d719a05..936e316 100644
--- a/layout.c
+++ b/layout.c
@@ -41,6 +41,12 @@ typedef struct {
       char name[256];
 } romlayout_t;

+/* include_args lists arguments specified at the command line with -i. They
+ * must be processed at some point so that desired regions are marked as
+ * "included" in the rom_entries list.
+ */
+static char *include_args[MAX_ROMLAYOUT];
+static int num_include_args = 0; /* the number of valid entries. */
 static romlayout_t rom_entries[MAX_ROMLAYOUT];

 #if CONFIG_INTERNAL == 1 /* FIXME: Move the whole block to cbtable.c? */
@@ -194,6 +200,20 @@ int read_romlayout(char *name)
 }
 #endif

+/* register an include argument (-i) for later processing */
+int register_include_arg(char *name)
+{
+       if (num_include_args >= MAX_ROMLAYOUT) {
+               msg_gerr("Too many regions included (%i).\n", num_include_args);
+               return -1;
+       }
+
+       include_args[num_include_args] = name;
+       num_include_args++;
+       return num_include_args;
+}
+
+/* returns the index of the entry (or a negative value if it is not found) */
 int find_romentry(char *name)
 {
       int i;
@@ -201,20 +221,49 @@ int find_romentry(char *name)
       if (!romimages)
               return -1;

-       msg_ginfo("Looking for \"%s\"... ", name);
-
+       msg_gspew("Looking for region \"%s\"... ", name);
       for (i = 0; i < romimages; i++) {
               if (!strcmp(rom_entries[i].name, name)) {
                       rom_entries[i].included = 1;
-                       msg_ginfo("found.\n");
+                       msg_gspew("found.\n");
                       return i;
               }
       }
-       msg_ginfo("not found.\n");      // Not found. Error.
-
+       msg_gspew("not found.\n");
       return -1;
 }

+/* process -i arguments
+ * returns 0 to indicate success, <0 to indicate failure

+ */
+int process_include_args(void)
+{
+       int i;
+       unsigned int found = 0;
+       for (i = 0; i < num_include_args && include_args[i] != NULL; i++) {
+               /* User has specified an area, but no layout file is loaded. */
+               if (!romimages) {
+                       msg_gerr("Region requested (with -i \"%s\"), "
+                                "but no layout data is available.\n",
+                                include_args[i]);
+                       return -1;

+               }
+
+               if (find_romentry(include_args[i]) < 0) {
+                       msg_gerr("Invalid region specified: \"%s\"\n",
+                                include_args[i]);
+                       return -1;

+               }
+               if (found == 0)
+                       msg_ginfo("Using region(s): \"%s\"", include_args[i]);
+               else
+                       msg_ginfo(", \"%s\"", include_args[i]);
+               found++;
+       }
+       msg_ginfo(".\n");
+       return 0;
+}
+
 int find_next_included_romentry(unsigned int start)
 {
       int i;
@@ -246,11 +295,12 @@ int handle_romentries(struct flashchip *flash, uint8_t *oldcontents, uint8_t *ne
       int entry;
       unsigned int size = flash->total_size * 1024;

-       /* If no layout file was specified or the layout file was empty, assume
-        * that the user wants to flash the complete new image.
+       /* If no regions were specified for inclusion, assume
+        * that the user wants to write the complete new image.
        */
-       if (!romimages)
+       if (num_include_args == 0)
               return 0;
+
       /* Non-included romentries are ignored.
        * The union of all included romentries is used from the new image.
        */
@@ -262,6 +312,8 @@ int handle_romentries(struct flashchip *flash, uint8_t *oldcontents, uint8_t *ne
                              size - start);
                       break;
               }
+
+               /* For non-included region, copy from old content. */
               if (rom_entries[entry].start > start)
                       memcpy(newcontents + start, oldcontents + start,
                              rom_entries[entry].start - start);
--
1.7.1