r3932 - trunk/util/flashrom

Author: stuge
Date: 2009-02-09 21:26:14 +0100 (Mon, 09 Feb 2009)
New Revision: 3932

Modified:
   trunk/util/flashrom/flashrom.c
Log:
flashrom: Fix broken flash chip base address logic

Elan SC520 requries us to deal with flash chip base addresses at locations
other than top of 4GB. The logic for that was incorrectly triggered also when
a board had more than one flash chip. This patch will honor flashbase only when
probing for the first flash chip on the board, and look at top of 4GB for later
chips.

Signed-off-by: Peter Stuge 
Acked-by: Myles Watson

Modified: trunk/util/flashrom/flashrom.c
===================================================================
--- trunk/util/flashrom/flashrom.c	2009-02-09 17:52:54 UTC (rev 3931)
+++ trunk/util/flashrom/flashrom.c	2009-02-09 20:26:14 UTC (rev 3932)
@@ -121,7 +121,7 @@
    		size = getpagesize();
    	}

-		base = flashbase ? flashbase : (0xffffffff - size + 1);
+		base = flashbase && flashchips == first_flash ? flashbase : (0xffffffff - size + 1);
    	flash->virtual_memory = bios = physmap("flash chip", base, size);

if (force)