interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flash/nor/tcl.c: add filld command to write double-word with 64-bit value 

Change-Id: I2eeda7af7d855ed1284083d025994f8fa9531969
Signed-off-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reviewed-on: http://openocd.zylin.com/5443
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
This commit is contained in:
Tarek BOCHKATI 2020-02-07 18:36:29 +01:00 committed by Tomas Vanek
parent 61ef89ce4b
commit 1ef468edc5
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/openocd.texi
View File

@ -5074,10 +5074,11 @@ If @option{unlock} is specified, then the flash is unprotected
before erase starts. before erase starts.
@end deffn @end deffn
@deffn Command {flash fillw} address word length @deffn Command {flash filld} address double-word length
@deffnx Command {flash fillw} address word length
@deffnx Command {flash fillh} address halfword length @deffnx Command {flash fillh} address halfword length
@deffnx Command {flash fillb} address byte length @deffnx Command {flash fillb} address byte length
Fills flash memory with the specified @var{word} (32 bits), Fills flash memory with the specified @var{double-word} (64 bits), @var{word} (32 bits),
@var{halfword} (16 bits), or @var{byte} (8-bit) pattern, @var{halfword} (16 bits), or @var{byte} (8-bit) pattern,
starting at @var{address} and continuing starting at @var{address} and continuing
for @var{length} units (word/halfword/byte). for @var{length} units (word/halfword/byte).

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

@ -476,7 +476,7 @@ COMMAND_HANDLER(handle_flash_write_image_command)
COMMAND_HANDLER(handle_flash_fill_command) COMMAND_HANDLER(handle_flash_fill_command)
{ {
target_addr_t address; target_addr_t address;
uint32_t pattern; uint64_t pattern;
uint32_t count; uint32_t count;
struct target *target = get_current_target(CMD_CTX); struct target *target = get_current_target(CMD_CTX);
unsigned i; unsigned i;
@ -487,7 +487,7 @@ COMMAND_HANDLER(handle_flash_fill_command)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
COMMAND_PARSE_ADDRESS(CMD_ARGV[0], address); COMMAND_PARSE_ADDRESS(CMD_ARGV[0], address);
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], pattern); COMMAND_PARSE_NUMBER(u64, CMD_ARGV[1], pattern);
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], count); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], count);
struct flash_bank *bank; struct flash_bank *bank;
@ -496,6 +496,9 @@ COMMAND_HANDLER(handle_flash_fill_command)
return retval; return retval;
switch (CMD_NAME[4]) { switch (CMD_NAME[4]) {
case 'd':
wordsize = 8;
break;
case 'w': case 'w':
wordsize = 4; wordsize = 4;
break; break;
@ -541,6 +544,10 @@ COMMAND_HANDLER(handle_flash_fill_command)
uint8_t *ptr = buffer + padding_at_start; uint8_t *ptr = buffer + padding_at_start;
switch (wordsize) { switch (wordsize) {
case 8:
for (i = 0; i < count; i++, ptr += wordsize)
target_buffer_set_u64(target, ptr, pattern);
break;
case 4: case 4:
for (i = 0; i < count; i++, ptr += wordsize) for (i = 0; i < count; i++, ptr += wordsize)
target_buffer_set_u32(target, ptr, pattern); target_buffer_set_u32(target, ptr, pattern);
@ -577,9 +584,12 @@ COMMAND_HANDLER(handle_flash_fill_command)
goto done; goto done;
for (i = 0, ptr = buffer; i < count; i++) { for (i = 0, ptr = buffer; i < count; i++) {
uint32_t readback = 0; uint64_t readback = 0;
switch (wordsize) { switch (wordsize) {
case 8:
readback = target_buffer_get_u64(target, ptr);
break;
case 4: case 4:
readback = target_buffer_get_u32(target, ptr); readback = target_buffer_get_u32(target, ptr);
break; break;
@ -593,7 +603,7 @@ COMMAND_HANDLER(handle_flash_fill_command)
if (readback != pattern) { if (readback != pattern) {
LOG_ERROR( LOG_ERROR(
"Verification error address " TARGET_ADDR_FMT "Verification error address " TARGET_ADDR_FMT
", read back 0x%02" PRIx32 ", expected 0x%02" PRIx32, ", read back 0x%02" PRIx64 ", expected 0x%02" PRIx64,
address + i * wordsize, readback, pattern); address + i * wordsize, readback, pattern);
retval = ERROR_FAIL; retval = ERROR_FAIL;
goto done; goto done;
@ -1002,6 +1012,14 @@ static const struct command_registration flash_exec_command_handlers[] = {
"before erasing.", "before erasing.",
}, },
{
.name = "filld",
.handler = handle_flash_fill_command,
.mode = COMMAND_EXEC,
.usage = "address value n",
.help = "Fill n double-words with 64-bit value, starting at "
"word address. (No autoerase.)",
},
{ {
.name = "fillw", .name = "fillw",
.handler = handle_flash_fill_command, .handler = handle_flash_fill_command,