summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-05-22 07:10:46 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-05-22 07:10:46 +0000
commit1e57c24060642fa663cb20e33d65f687bfbe28b0 (patch)
treea033621451bfcc03ccfdc071f4cf1355d5c0706c
parent9f82928c470b196e1a9680c6628549ef2022ef64 (diff)
downloadflashrom-1e57c24060642fa663cb20e33d65f687bfbe28b0.zip
flashrom-1e57c24060642fa663cb20e33d65f687bfbe28b0.tar.gz
Initialize the internal delay function before running programmer init
The programmer init may need a good host delay function. Corresponding to flashrom svn r1006. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
-rw-r--r--cli_classic.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/cli_classic.c b/cli_classic.c
index 6e8f098..baca900 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -378,6 +378,9 @@ int cli_classic(int argc, char *argv[])
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 @@ int cli_classic(int argc, char *argv[])
}
/* 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);
OpenPOWER on IntegriCloud