aboutsummaryrefslogtreecommitdiff
path: root/src/flash
diff options
context:
space:
mode:
authorPaul Fertser <fercerpav@gmail.com>2015-02-21 10:55:41 +0300
committerPaul Fertser <fercerpav@gmail.com>2015-03-09 08:58:16 +0000
commit571db89aa13554d5c5e38e88233927d3149edc3a (patch)
tree76b5961b8367ca52ed4384ed4b5987f34c21764c /src/flash
parent5aa08f785101b0eb72eabf61fac537fb0e91379f (diff)
flash/nor/stellaris: allow to recover a locked device that can't be examined
Change-Id: I28536184053e2d1ba906620e728f7fad6ba39f0a Reported-by: Ed Beroset <beroset@mindspring.com> Signed-off-by: Paul Fertser <fercerpav@gmail.com> Reviewed-on: http://openocd.zylin.com/2552 Tested-by: jenkins Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk> Reviewed-by: Ed Beroset <beroset@ieee.org>
Diffstat (limited to 'src/flash')
-rw-r--r--src/flash/nor/stellaris.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c
index 664b6d03..27b66325 100644
--- a/src/flash/nor/stellaris.c
+++ b/src/flash/nor/stellaris.c
@@ -1359,12 +1359,12 @@ COMMAND_HANDLER(stellaris_handle_recover_command)
struct flash_bank *bank;
int retval;
- if (CMD_ARGC < 1)
+ if (CMD_ARGC != 0)
return ERROR_COMMAND_SYNTAX_ERROR;
- retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
- if (retval != ERROR_OK)
- return retval;
+ bank = get_flash_bank_by_num_noprobe(0);
+ if (!bank)
+ return ERROR_FAIL;
/* REVISIT ... it may be worth sanity checking that the AP is
* inactive before we start. ARM documents that switching a DP's
@@ -1425,7 +1425,7 @@ static const struct command_registration stellaris_exec_command_handlers[] = {
.name = "recover",
.handler = stellaris_handle_recover_command,
.mode = COMMAND_EXEC,
- .usage = "bank_id",
+ .usage = "",
.help = "recover (and erase) locked device",
},
COMMAND_REGISTRATION_DONE