diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2007-08-23 15:20:38 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2007-08-23 15:20:38 +0000 |
| commit | 0a6bb9106263eead0dd35d68be90ab52223488d5 (patch) | |
| tree | 32f0bb2ec46c53a27da31e1935420a713a77d662 /util/flashrom/m29f400bt.c | |
| parent | 2fe239134cf3f8b74267d1472c03a99d9ab13bcc (diff) | |
| download | coreboot-0a6bb9106263eead0dd35d68be90ab52223488d5.tar.xz | |
Drop duplicated code (copies of plain JEDEC functions).
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2747 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/flashrom/m29f400bt.c')
| -rw-r--r-- | util/flashrom/m29f400bt.c | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/util/flashrom/m29f400bt.c b/util/flashrom/m29f400bt.c index e33c1068b3..eb97591868 100644 --- a/util/flashrom/m29f400bt.c +++ b/util/flashrom/m29f400bt.c @@ -25,37 +25,6 @@ #include "flash.h" -void toggle_ready_m29f400bt(volatile uint8_t *dst) -{ - unsigned int i = 0; - uint8_t tmp1, tmp2; - - tmp1 = *dst & 0x40; - - while (i++ < 0xFFFFFF) { - tmp2 = *dst & 0x40; - if (tmp1 == tmp2) { - break; - } - tmp1 = tmp2; - } -} - -void data_polling_m29f400bt(volatile uint8_t *dst, uint8_t data) -{ - unsigned int i = 0; - uint8_t tmp; - - data &= 0x80; - - while (i++ < 0xFFFFFF) { - tmp = *dst & 0x80; - if (tmp == data) { - break; - } - } -} - void protect_m29f400bt(volatile uint8_t *bios) { *(volatile uint8_t *)(bios + 0xAAA) = 0xAA; @@ -79,7 +48,7 @@ void write_page_m29f400bt(volatile uint8_t *bios, uint8_t *src, *dst = *src; //*(volatile char *) (bios) = 0xF0; //usleep(5); - toggle_ready_m29f400bt(dst); + toggle_ready_jedec(dst); printf ("Value in the flash at address %p = %#x, want %#x\n", (uint8_t *) (dst - bios), *dst, *src); @@ -129,7 +98,7 @@ int erase_m29f400bt(struct flashchip *flash) *(volatile uint8_t *)(bios + 0xAAA) = 0x10; myusec_delay(10); - toggle_ready_m29f400bt(bios); + toggle_ready_jedec(bios); return (0); } @@ -147,7 +116,7 @@ int block_erase_m29f400bt(volatile uint8_t *bios, volatile uint8_t *dst) *dst = 0x30; myusec_delay(10); - toggle_ready_m29f400bt(bios); + toggle_ready_jedec(bios); return (0); } |