diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2011-06-26 17:04:16 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2011-06-26 17:04:16 +0000 |
| commit | 562440bfcbf1c244e7e70a0c33b266b64ba420f3 (patch) | |
| tree | 99b4aec1edbe35372a0fe653b5448f52c0fe98c8 /spi25.c | |
| parent | 520e25c568ba37f0d428ae4c4ac55ac9223938a3 (diff) | |
| download | flashrom-562440bfcbf1c244e7e70a0c33b266b64ba420f3.zip flashrom-562440bfcbf1c244e7e70a0c33b266b64ba420f3.tar.gz | |
Erase functions are no longer called from chip drivers and thus their internal erase verification can be moved to generic code
This also makes it easier to skip the verify step if desired and to
differentiate between failed command submission and failed erase verification.
Corresponding to flashrom svn r1353.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'spi25.c')
| -rw-r--r-- | spi25.c | 30 |
1 files changed, 6 insertions, 24 deletions
@@ -481,10 +481,7 @@ int spi_chip_erase_60(struct flashchip *flash) /* FIXME: We assume spi_read_status_register will never fail. */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(1000 * 1000); - if (check_erased_range(flash, 0, flash->total_size * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -520,10 +517,7 @@ int spi_chip_erase_c7(struct flashchip *flash) /* FIXME: We assume spi_read_status_register will never fail. */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(1000 * 1000); - if (check_erased_range(flash, 0, flash->total_size * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -564,10 +558,7 @@ int spi_block_erase_52(struct flashchip *flash, unsigned int addr, unsigned int */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -613,10 +604,7 @@ int spi_block_erase_d8(struct flashchip *flash, unsigned int addr, unsigned int */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -660,10 +648,7 @@ int spi_block_erase_d7(struct flashchip *flash, unsigned int addr, unsigned int */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -705,10 +690,7 @@ int spi_block_erase_20(struct flashchip *flash, unsigned int addr, unsigned int */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(10 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } |
