diff options
| author | Li-Ta Lo <ollie@lanl.gov> | 2004-03-27 00:31:03 +0000 |
|---|---|---|
| committer | Li-Ta Lo <ollie@lanl.gov> | 2004-03-27 00:31:03 +0000 |
| commit | 5a56d51d54a0b1c119e5f9f8d913b625843ed985 (patch) | |
| tree | 09f9fb6e3da461fff2f81e06309266c3df0551e9 /util/flash_and_burn | |
| parent | 39daaac582766e94a6f2f8ad00900e623d514d7a (diff) | |
data tye consistence
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1487 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/flash_and_burn')
| -rw-r--r-- | util/flash_and_burn/jedec.c | 12 | ||||
| -rw-r--r-- | util/flash_and_burn/jedec.h | 5 |
2 files changed, 7 insertions, 10 deletions
diff --git a/util/flash_and_burn/jedec.c b/util/flash_and_burn/jedec.c index b4c069fe82..d99e774be7 100644 --- a/util/flash_and_burn/jedec.c +++ b/util/flash_and_burn/jedec.c @@ -30,7 +30,7 @@ int probe_jedec(struct flashchip *flash) { - volatile char *bios = flash->virt_addr; + volatile unsigned char *bios = flash->virt_addr; unsigned char id1, id2; /* Issue JEDEC Product ID Entry command */ @@ -60,7 +60,7 @@ int probe_jedec(struct flashchip *flash) return 0; } -int erase_sector_jedec(volatile char *bios, unsigned int page) +int erase_sector_jedec(volatile unsigned char *bios, unsigned int page) { volatile unsigned char *Temp; @@ -120,8 +120,8 @@ int erase_chip_jedec(struct flashchip *flash) return (0); } -void write_page_write_jedec(volatile char *bios, char *src, volatile char *dst, - int page_size) +void write_page_write_jedec(volatile unsigned char *bios, unsigned char *src, + volatile unsigned char *dst, int page_size) { int i; @@ -146,7 +146,6 @@ int write_byte_program_jedec(volatile unsigned char *bios, unsigned char *src, /* transfer data from source to destination */ if (*src == 0xFF) { - dst++, src++; /* If the data is 0xFF, don't program it */ return 0; } @@ -164,8 +163,7 @@ int write_byte_program_jedec(volatile unsigned char *bios, unsigned char *src, } int write_sector_jedec(volatile unsigned char *bios, unsigned char *src, - volatile unsigned char *dst, - unsigned int page_size) + volatile unsigned char *dst, unsigned int page_size) { int i; diff --git a/util/flash_and_burn/jedec.h b/util/flash_and_burn/jedec.h index 5e7bf2e135..756605e0b5 100644 --- a/util/flash_and_burn/jedec.h +++ b/util/flash_and_burn/jedec.h @@ -4,9 +4,8 @@ extern int probe_jedec(struct flashchip *flash); extern int erase_chip_jedec(struct flashchip *flash); extern int write_jedec(struct flashchip *flash, unsigned char *buf); -extern int erase_sector_jedec(volatile char *bios, unsigned int page); -extern int write_sector_jedec(volatile unsigned char *bios, - unsigned char *src, +extern int erase_sector_jedec(volatile unsigned char *bios, unsigned int page); +extern int write_sector_jedec(volatile unsigned char *bios, unsigned char *src, volatile unsigned char *dst, unsigned int page_size); |