summaryrefslogtreecommitdiff
path: root/src/flash/nor
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2010-03-03 12:59:53 -0800
committerDavid Brownell <dbrownell@users.sourceforge.net>2010-03-03 13:08:16 -0800
commit99939c3c75f3bef44d4cd176e90a6c5fe8b833da (patch)
tree118817302be98c3d887bdffa7b61c0d2106c027c /src/flash/nor
parent2119c0a7641d05ad8b6b8feb64d4c315716f6d3a (diff)
downloadopenocd_libswd-99939c3c75f3bef44d4cd176e90a6c5fe8b833da.tar.gz
openocd_libswd-99939c3c75f3bef44d4cd176e90a6c5fe8b833da.tar.bz2
openocd_libswd-99939c3c75f3bef44d4cd176e90a6c5fe8b833da.tar.xz
openocd_libswd-99939c3c75f3bef44d4cd176e90a6c5fe8b833da.zip
NOR: stellaris message tweaks
Give a more accurate failure message when trying to unprotect; don't complain about pages being write protected, just say that unprotect is not supported by the hardware ... referencing the new "recover" command, which is the way to achieve that. Likewise, when trying to protect, talk about "pages" (matching hardware doc) not "sectors" (an concept that's alien to these chips). Also make the helptext for the "recover" command mention that it also erases the device. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/flash/nor')
-rw-r--r--src/flash/nor/stellaris.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c
index c9c800ea..0b7c45a3 100644
--- a/src/flash/nor/stellaris.c
+++ b/src/flash/nor/stellaris.c
@@ -693,8 +693,8 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la
if (!set)
{
- LOG_ERROR("Can't unprotect write-protected pages.");
- /* except by the "recover locked device" procedure ... */
+ LOG_ERROR("Hardware doesn't suppport page-level unprotect. "
+ "Try the 'recover' command.");
return ERROR_INVALID_ARGUMENTS;
}
@@ -706,7 +706,7 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la
|| (last < first) || !(last & 1)
|| (last >= 2 * stellaris_info->num_lockbits))
{
- LOG_ERROR("Can't protect unaligned or out-of-range sectors.");
+ LOG_ERROR("Can't protect unaligned or out-of-range pages.");
return ERROR_FLASH_SECTOR_INVALID;
}
@@ -1240,7 +1240,7 @@ static const struct command_registration stellaris_exec_command_handlers[] = {
.handler = stellaris_handle_recover_command,
.mode = COMMAND_EXEC,
.usage = "bank_id",
- .help = "recover locked device",
+ .help = "recover (and erase) locked device",
},
COMMAND_REGISTRATION_DONE
};