[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-51-g99939c3

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  99939c3c75f3bef44d4cd176e90a6c5fe8b833da (commit)
      from  2119c0a7641d05ad8b6b8feb64d4c315716f6d3a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 99939c3c75f3bef44d4cd176e90a6c5fe8b833da
Author: David Brownell <dbr...@us...>
Date:   Wed Mar 3 12:59:53 2010 -0800

    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 <dbr...@us...>

diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c
index c9c800e..0b7c45a 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
 };

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nor/stellaris.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository