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>
__archive__
David Brownell 2010-03-03 12:59:53 -08:00
parent 2119c0a764
commit 99939c3c75
1 changed files with 4 additions and 4 deletions

View File

@ -693,8 +693,8 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la
if (!set) if (!set)
{ {
LOG_ERROR("Can't unprotect write-protected pages."); LOG_ERROR("Hardware doesn't suppport page-level unprotect. "
/* except by the "recover locked device" procedure ... */ "Try the 'recover' command.");
return ERROR_INVALID_ARGUMENTS; 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 < first) || !(last & 1)
|| (last >= 2 * stellaris_info->num_lockbits)) || (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; return ERROR_FLASH_SECTOR_INVALID;
} }
@ -1240,7 +1240,7 @@ static const struct command_registration stellaris_exec_command_handlers[] = {
.handler = stellaris_handle_recover_command, .handler = stellaris_handle_recover_command,
.mode = COMMAND_EXEC, .mode = COMMAND_EXEC,
.usage = "bank_id", .usage = "bank_id",
.help = "recover locked device", .help = "recover (and erase) locked device",
}, },
COMMAND_REGISTRATION_DONE COMMAND_REGISTRATION_DONE
}; };