diff options
| author | Michael Schwingen <michael@schwingen.org> | 2011-01-02 21:01:19 +0100 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2011-01-02 21:15:08 +0100 |
| commit | d8ece229f9f06e66ad994ca996148912dc0b76b5 (patch) | |
| tree | e05e181a5c46694bb290a93c07b2e9a362fce32a /src/flash/nor/non_cfi.c | |
| parent | d356034f03eb60fd4e8b3537bd979d9e7e5e25f8 (diff) | |
| download | openocd_libswd-d8ece229f9f06e66ad994ca996148912dc0b76b5.tar.gz openocd_libswd-d8ece229f9f06e66ad994ca996148912dc0b76b5.tar.bz2 openocd_libswd-d8ece229f9f06e66ad994ca996148912dc0b76b5.tar.xz openocd_libswd-d8ece229f9f06e66ad994ca996148912dc0b76b5.zip | |
non-CFI flash code uses data from CFI structures. Make sure that timeouts are filled in on non-CFI flashes, and print CFI information in all cases, nut just on CFI flashes.
Signed-off-by: Michael Schwingen <michael@schwingen.org>
Diffstat (limited to 'src/flash/nor/non_cfi.c')
| -rw-r--r-- | src/flash/nor/non_cfi.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/flash/nor/non_cfi.c b/src/flash/nor/non_cfi.c index c68ace67..b6739043 100644 --- a/src/flash/nor/non_cfi.c +++ b/src/flash/nor/non_cfi.c @@ -477,10 +477,12 @@ void cfi_fixup_non_cfi(struct flash_bank *bank) cfi_info->vcc_max = 0x0; cfi_info->vpp_min = 0x0; cfi_info->vpp_max = 0x0; - cfi_info->word_write_timeout_typ = 0x0; - cfi_info->buf_write_timeout_typ = 0x0; - cfi_info->block_erase_timeout_typ = 0x0; - cfi_info->chip_erase_timeout_typ = 0x0; + /* these are used for timeouts - use vales that should be long enough + for normal operation. */ + cfi_info->word_write_timeout_typ = 0x0a; + cfi_info->buf_write_timeout_typ = 0x0d; + cfi_info->block_erase_timeout_typ = 0x0d; + cfi_info->chip_erase_timeout_typ = 0x10; cfi_info->word_write_timeout_max = 0x0; cfi_info->buf_write_timeout_max = 0x0; cfi_info->block_erase_timeout_max = 0x0; |