Changeset 3791

Timestamp:

12/03/08 22:39:56 (5 weeks ago)

Author:

stuge

Message:

flashrom: Fix bug in r3790

If flashbase was set before probe_flash() it would only ever be used once, for
the very first flash chip probe.

Signed-off-by: Peter Stuge <peter@…>
Acked-by: Peter Stuge <peter@…>

Files:

• trunk/util/flashrom/flashrom.c (modified) (3 diffs)

trunk/util/flashrom/flashrom.c

@@ -106 +106 @@
         volatile uint8_t *bios;
         struct flashchip *flash;
-        unsigned long size;
+        unsigned long base, size;
 
         for (flash = first_flash; flash && flash->name; flash++) {
@@ -134 +134 @@
                         size = getpagesize();
                 }
-                if (!flashbase)
-                        flashbase = (0xffffffff - size + 1);
-
+
+                base = flashbase ? flashbase : (0xffffffff - size + 1);
                 bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
-                            fd_mem, (off_t) flashbase);
+                            fd_mem, (off_t) base);
                 if (bios == MAP_FAILED) {
                         perror("Can't mmap memory using " MEM_DEV);
@@ -163 +162 @@
 
         printf("Found chip \"%s %s\" (%d KB) at physical address 0x%lx.\n",
-               flash->vendor, flash->name, flash->total_size, flashbase);
+               flash->vendor, flash->name, flash->total_size, base);
+        flashbase = base;
         return flash;
 }