diff options
author | Marc Schink <dev@zapb.de> | 2021-05-07 12:02:23 +0200 |
---|---|---|
committer | Antonio Borneo <borneo.antonio@gmail.com> | 2021-08-14 13:32:07 +0100 |
commit | 38f94a26772f2e1c99e4e65ac1b60bc9e1bb150a (patch) | |
tree | 492d78691cfbb081d159664bfe9254e1a29bdd04 /src/flash/nor/cfi.c | |
parent | a555434c50544410ab6f8915f1e2a829cc6e6de2 (diff) | |
download | riscv-openocd-38f94a26772f2e1c99e4e65ac1b60bc9e1bb150a.zip riscv-openocd-38f94a26772f2e1c99e4e65ac1b60bc9e1bb150a.tar.gz riscv-openocd-38f94a26772f2e1c99e4e65ac1b60bc9e1bb150a.tar.bz2 |
flash/nor: Do not update 'is_erased'
Remove useless setting of the 'is_erased' flag after a flash
modification. Also, remove code that erroneously depends on
this flag.
Keep the flag for now since it is still used by the
erase_check() functionality.
See commit 07da3b3913dcb6b65564f4fe67c2f26032f180c0
Change-Id: Ia046905bc9e0cb2572145f19251c3e10c4e2d553
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/6279
Tested-by: jenkins
Reviewed-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Diffstat (limited to 'src/flash/nor/cfi.c')
-rw-r--r-- | src/flash/nor/cfi.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c index 830d3e3..e3fb6c8 100644 --- a/src/flash/nor/cfi.c +++ b/src/flash/nor/cfi.c @@ -870,9 +870,7 @@ static int cfi_intel_erase(struct flash_bank *bank, unsigned int first, if (retval != ERROR_OK) return retval; - if (status == 0x80) - bank->sectors[i].is_erased = 1; - else { + if (status != 0x80) { retval = cfi_send_command(bank, 0xff, cfi_flash_address(bank, 0, 0x0)); if (retval != ERROR_OK) return retval; @@ -927,9 +925,7 @@ static int cfi_spansion_erase(struct flash_bank *bank, unsigned int first, if (retval != ERROR_OK) return retval; - if (cfi_spansion_wait_status_busy(bank, cfi_info->block_erase_timeout) == ERROR_OK) - bank->sectors[i].is_erased = 1; - else { + if (cfi_spansion_wait_status_busy(bank, cfi_info->block_erase_timeout) != ERROR_OK) { retval = cfi_send_command(bank, 0xf0, cfi_flash_address(bank, 0, 0x0)); if (retval != ERROR_OK) return retval; |