mirror of
https://review.coreboot.org/flashrom.git
synced 2025-04-26 22:52:34 +02:00
Clean up at user request
Corresponding to coreboot v1 svn r743.
This commit is contained in:
parent
bb0322f335
commit
4572a82245
13
flash_rom.c
13
flash_rom.c
@ -181,7 +181,7 @@ unsigned long micro = 0;
|
|||||||
void
|
void
|
||||||
myusec_calibrate_delay()
|
myusec_calibrate_delay()
|
||||||
{
|
{
|
||||||
unsigned long count = 2 * 1024 * 1024;
|
unsigned long count = 20 * 1024 * 1024;
|
||||||
volatile unsigned long i;
|
volatile unsigned long i;
|
||||||
unsigned long timeusec;
|
unsigned long timeusec;
|
||||||
struct timeval start, end;
|
struct timeval start, end;
|
||||||
@ -189,7 +189,7 @@ myusec_calibrate_delay()
|
|||||||
|
|
||||||
fprintf(stderr, "Setting up microsecond timing loop\n");
|
fprintf(stderr, "Setting up microsecond timing loop\n");
|
||||||
while (! ok) {
|
while (! ok) {
|
||||||
fprintf(stderr, "Try %d\n", count);
|
//fprintf(stderr, "Try %d\n", count);
|
||||||
gettimeofday(&start, 0);
|
gettimeofday(&start, 0);
|
||||||
for( i = count; i; i--)
|
for( i = count; i; i--)
|
||||||
;
|
;
|
||||||
@ -206,7 +206,7 @@ myusec_calibrate_delay()
|
|||||||
// compute one microsecond. That will be count / time
|
// compute one microsecond. That will be count / time
|
||||||
micro = count / timeusec;
|
micro = count / timeusec;
|
||||||
|
|
||||||
fprintf(stderr, "one us is %d count\n", micro);
|
//fprintf(stderr, "one us is %d count\n", micro);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -227,8 +227,6 @@ main (int argc, char * argv[])
|
|||||||
FILE * image;
|
FILE * image;
|
||||||
struct flashchip * flash;
|
struct flashchip * flash;
|
||||||
|
|
||||||
myusec_calibrate_delay();
|
|
||||||
|
|
||||||
if (argc > 2){
|
if (argc > 2){
|
||||||
printf("usage: %s [romimage]\n", argv[0]);
|
printf("usage: %s [romimage]\n", argv[0]);
|
||||||
printf(" If no romimage is specified, then all that happens\n");
|
printf(" If no romimage is specified, then all that happens\n");
|
||||||
@ -255,6 +253,11 @@ main (int argc, char * argv[])
|
|||||||
buf = (char *) calloc (size, sizeof(char));
|
buf = (char *) calloc (size, sizeof(char));
|
||||||
fread (buf, sizeof(char), size, image);
|
fread (buf, sizeof(char), size, image);
|
||||||
|
|
||||||
|
printf("Calibrating timer since microsleep sucks ... takes a second\n");
|
||||||
|
myusec_calibrate_delay();
|
||||||
|
printf("OK, calibrated, now do the deed\n");
|
||||||
|
|
||||||
flash->write (flash, buf);
|
flash->write (flash, buf);
|
||||||
verify_flash (flash, buf);
|
verify_flash (flash, buf);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -44,7 +44,7 @@ int probe_29f002 (struct flashchip * flash)
|
|||||||
|
|
||||||
myusec_delay(10);
|
myusec_delay(10);
|
||||||
|
|
||||||
printf(__FUNCTION__ "id1 %d, id2 %d\n", id1, id2);
|
printf("%s: id1 %d, id2 %d\n", __FUNCTION__, id1, id2);
|
||||||
if (id1 == flash->manufacture_id && id2 == flash->model_id)
|
if (id1 == flash->manufacture_id && id2 == flash->model_id)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user