auracaster/sw_openocd
3
0
Fork 0
forked from auracaster/openocd
Code Pull Requests Activity

flash: erase_address now has an unlock option

Browse Source 
Quite useful to be able to unlock the flash, just like in
the flash write_image cmd.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
This commit is contained in:
Øyvind Harboe
2010-05-05 09:32:43 +02:00
parent 3077f5845f
commit f7e0f3c285
4 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/flash/nor/core.c
View File

@@ -502,7 +502,7 @@ static int flash_driver_unprotect(struct flash_bank *bank, int first, int last)
return flash_driver_protect(bank, 0, first, last);
}
static int flash_unlock_address_range(struct target *target, uint32_t addr, uint32_t length)
int flash_unlock_address_range(struct target *target, uint32_t addr, uint32_t length)
{
/* By default, pad to sector boundaries ... the real issue here
* is that our (only) caller *permanently* removes protection,

3
src/flash/nor/core.h
View File

@@ -108,6 +108,9 @@ int flash_register_commands(struct command_context *cmd_ctx);
int flash_erase_address_range(struct target *target,
bool pad, uint32_t addr, uint32_t length);
int flash_unlock_address_range(struct target *target, uint32_t addr,
uint32_t length);
/**
* Writes @a image into the @a target flash. The @a written parameter
* will contain the

47
src/flash/nor/tcl.c
View File

@@ -194,32 +194,40 @@ COMMAND_HANDLER(handle_flash_erase_check_command)
COMMAND_HANDLER(handle_flash_erase_address_command)
{
struct flash_bank *p;
int retval;
int retval = ERROR_OK;
int address;
int length;
bool do_pad = false;
bool do_unlock = false;
struct target *target = get_current_target(CMD_CTX);
switch (CMD_ARGC) {
case 3:
while (CMD_ARGC >= 3)
{
/* Optionally pad out the address range to block/sector
* boundaries. We can't know if there's data in that part
* of the flash; only do padding if we're told to.
*/
if (strcmp("pad", CMD_ARGV[0]) != 0)
if (strcmp("pad", CMD_ARGV[0]) == 0)
{
do_pad = true;
} else if (strcmp("unlock", CMD_ARGV[0]) == 0)
{
do_unlock = true;
} else
{
return ERROR_COMMAND_SYNTAX_ERROR;
do_pad = true;
}
CMD_ARGC--;
CMD_ARGV++;
/* FALL THROUGH */
case 2:
COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], address);
COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], length);
break;
default:
}
if (CMD_ARGC != 2)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], address);
COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], length);
if (length <= 0)
{
command_print(CMD_CTX, "Length must be >0");
@@ -238,7 +246,15 @@ COMMAND_HANDLER(handle_flash_erase_address_command)
struct duration bench;
duration_start(&bench);
retval = flash_erase_address_range(target, do_pad, address, length);
if (do_unlock)
{
retval = flash_unlock_address_range(target, address, length);
}
if (retval == ERROR_OK)
{
retval = flash_erase_address_range(target, do_pad, address, length);
}
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
@@ -709,12 +725,15 @@ static const struct command_registration flash_exec_command_handlers[] = {
.name = "erase_address",
.handler = handle_flash_erase_address_command,
.mode = COMMAND_EXEC,
.usage = "['pad'] address length",
.usage = "['pad'] ['unlock'] address length",
.help = "Erase flash sectors starting at address and "
"continuing for length bytes. If 'pad' is specified, "
"data outside that range may also be erased: the start "
"address may be decreased, and length increased, so "
"that all of the first and last sectors are erased.",
"that all of the first and last sectors are erased. "
"If 'unlock' is specified, then the flash is unprotected "
"before erasing.",
},
{
.name = "fillw",