[flashrom] [commit] r1006 - trunk

[repository service]

Author: hailfinger
Date: Sat May 22 09:10:46 2010
New Revision: 1006
URL: http://flashrom.org/trac/coreboot/changeset/1006

Log:
Initialize the internal delay function before running programmer init.
The programmer init may need a good host delay function.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Michael Karcher <flashrom at mkarcher.dialup.fu-berlin.de>

Modified:
   trunk/cli_classic.c

Modified: trunk/cli_classic.c
==============================================================================
--- trunk/cli_classic.c	Sat May 22 01:09:42 2010	(r1005)
+++ trunk/cli_classic.c	Sat May 22 09:10:46 2010	(r1006)
@@ -378,6 +378,9 @@
 		flash = NULL;
 	}
 
+	/* FIXME: Delay calibration should happen in programmer code. */
+	myusec_calibrate_delay();
+
 	msg_pdbg("Initializing %s programmer\n",
 		 programmer_table[programmer].name);
 	if (programmer_init()) {
@@ -386,8 +389,6 @@
 	}
 
 	/* FIXME: Delay calibration should happen in programmer code. */
-	myusec_calibrate_delay();
-
 	for (i = 0; i < ARRAY_SIZE(flashes); i++) {
 		flashes[i] =
 		    probe_flash(i ? flashes[i - 1] + 1 : flashchips, 0);