summaryrefslogtreecommitdiff
path: root/src/flash
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2010-06-14 09:47:33 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-06-14 09:48:12 +0200
commit18918a0423e04180f580a4a9453e190488aab17d (patch)
treef36e95737333503510365d57e7dc4f37d1af8c42 /src/flash
parentaa2de47d3ce4d484c124f0449702f511aab49112 (diff)
downloadopenocd+libswd-18918a0423e04180f580a4a9453e190488aab17d.tar.gz
openocd+libswd-18918a0423e04180f580a4a9453e190488aab17d.tar.bz2
openocd+libswd-18918a0423e04180f580a4a9453e190488aab17d.tar.xz
openocd+libswd-18918a0423e04180f580a4a9453e190488aab17d.zip
cfi: fix gaffe introduced in previous version
flash probe broke w/in last commit. ecc8041c0f4c30a7310c0f8414a5261ee7a090ca Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/flash')
-rw-r--r--src/flash/nor/cfi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index f911bb70..714cbe45 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -2473,10 +2473,10 @@ static int cfi_probe(struct flash_bank *bank)
(1 << cfi_info->chip_erase_timeout_max) * (1 << cfi_info->chip_erase_timeout_typ));
uint8_t data;
- retval = 1 << cfi_query_u8(bank, 0, 0x27, &data);
+ retval = cfi_query_u8(bank, 0, 0x27, &data);
if (retval != ERROR_OK)
return retval;
- cfi_info->dev_size = data;
+ cfi_info->dev_size = 1 << data;
retval = cfi_query_u16(bank, 0, 0x28, &cfi_info->interface_desc);
if (retval != ERROR_OK)