summaryrefslogtreecommitdiffstats
path: root/flash_rom.c
diff options
context:
space:
mode:
authorOllie Lho <ollie@sis.com.tw>2004-12-07 03:15:51 +0000
committerOllie Lho <ollie@sis.com.tw>2004-12-07 03:15:51 +0000
commit98bea8aba5a1dad1abc2b1d191f873e1d45d5b50 (patch)
tree9d6bd66ce4d93b8adabc83aeae4e1c94c94ff862 /flash_rom.c
parentad8ffd2e7646b8d5a5c08cab9252f69f1156a6fe (diff)
downloadast2050-flashrom-98bea8aba5a1dad1abc2b1d191f873e1d45d5b50.zip
ast2050-flashrom-98bea8aba5a1dad1abc2b1d191f873e1d45d5b50.tar.gz
SST49LF00[2,3,4] should use the same driver as 49LF008
Corresponding to flashrom svn r27 and coreboot v2 svn r1812.
Diffstat (limited to 'flash_rom.c')
-rw-r--r--flash_rom.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/flash_rom.c b/flash_rom.c
index d0d3b80..ff99cb0 100644
--- a/flash_rom.c
+++ b/flash_rom.c
@@ -71,11 +71,11 @@ struct flashchip flashchips[] = {
{"SST49LF080A", SST_ID, SST_49LF080A, NULL, 1024, 4096,
probe_jedec, erase_chip_jedec, write_49lf040,NULL},
{"SST49LF002A", SST_ID, SST_49LF002A, NULL, 256, 4096,
- probe_jedec, erase_chip_jedec, write_49lf040,NULL},
+ probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub, NULL},
{"SST49LF003A", SST_ID, SST_49LF003A, NULL, 384, 4096,
- probe_jedec, erase_chip_jedec, write_49lf040,NULL},
+ probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub,NULL},
{"SST49LF004A", SST_ID, SST_49LF004A, NULL, 512, 4096,
- probe_jedec, erase_chip_jedec, write_49lf040,NULL},
+ probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub,NULL},
{"SST49LF008A", SST_ID, SST_49LF008A, NULL, 1024, 4096,
probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub, NULL},
#endif
@@ -250,9 +250,9 @@ int main(int argc, char *argv[])
sscanf(tempstr,"%x",&exclude_start_position);
break;
case 'e':
- tempstr = strdup(optarg);
- sscanf(tempstr,"%x",&exclude_end_position);
- break;
+ tempstr = strdup(optarg);
+ sscanf(tempstr,"%x",&exclude_end_position);
+ break;
default:
usage(argv[0]);
@@ -260,7 +260,6 @@ int main(int argc, char *argv[])
}
}
-
if (read_it && write_it) {
printf("-r and -w are mutually exclusive\n");
usage(argv[0]);
@@ -285,8 +284,7 @@ int main(int argc, char *argv[])
printf("Part is %s\n", flash->name);
if (!filename) {
- printf
- ("OK, only ENABLING flash write, but NOT FLASHING\n");
+ printf("OK, only ENABLING flash write, but NOT FLASHING\n");
return 0;
}
size = flash->total_size * 1024;
@@ -303,8 +301,9 @@ int main(int argc, char *argv[])
else
flash->read(flash, buf);
- if(exclude_end_position - exclude_start_position > 0)
- memset(buf+exclude_start_position, 0, exclude_end_position-exclude_start_position);
+ if (exclude_end_position - exclude_start_position > 0)
+ memset(buf+exclude_start_position, 0,
+ exclude_end_position-exclude_start_position);
fwrite(buf, sizeof(char), size, image);
fclose(image);
@@ -318,15 +317,16 @@ int main(int argc, char *argv[])
fclose(image);
}
- if(exclude_end_position - exclude_start_position > 0)
- memcpy(buf+exclude_start_position, (const char *) flash->virt_addr+exclude_start_position,
- exclude_end_position-exclude_start_position);
-
+ if (exclude_end_position - exclude_start_position > 0)
+ memcpy(buf+exclude_start_position,
+ (const char *) flash->virt_addr+exclude_start_position,
+ exclude_end_position-exclude_start_position);
+
exclude_start_page = exclude_start_position/flash->page_size;
- if((exclude_start_position%flash->page_size) != 0) {
- exclude_start_page++;
- }
- exclude_end_page = exclude_end_position/flash->page_size;
+ if ((exclude_start_position%flash->page_size) != 0) {
+ exclude_start_page++;
+ }
+ exclude_end_page = exclude_end_position/flash->page_size;
if (write_it || (!read_it && !verify_it)) {
flash->write(flash, buf);
OpenPOWER on IntegriCloud