Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: aa2de47)
cfi: fix gaffe introduced in previous version
authorØyvind Harboe <oyvind.harboe@zylin.com>
Mon, 14 Jun 2010 07:47:33 +0000 (09:47 +0200)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Mon, 14 Jun 2010 07:48:12 +0000 (09:48 +0200)
flash probe broke w/in last commit.

ecc8041c0f4c30a7310c0f8414a5261ee7a090ca

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
src/flash/nor/cfi.c patch | blob | history

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index f911bb709c8c5eb8896d0c71ed00b437b47628be..714cbe451e711b5f63a480da3ff8b851ebf933e3 100644 (file)
--- 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)
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)