interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

flash: add flash bank name support 

flash cmds can now be passed either the bank name or the bank number.
For example.
flash info stm32.flash
flash info 0

Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
This commit is contained in:
Spencer Oliver 2010-05-12 22:40:19 +01:00
parent 7b76da57f4
commit 7b36d2a229
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,21 +49,18 @@ COMMAND_HELPER(flash_command_get_bank, unsigned name_index,
COMMAND_HANDLER(handle_flash_info_command) COMMAND_HANDLER(handle_flash_info_command)
{ {
struct flash_bank *p; struct flash_bank *p;
uint32_t i = 0;
int j = 0; int j = 0;
int retval; int retval;
if (CMD_ARGC != 1) if (CMD_ARGC != 1)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
unsigned bank_nr; retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &p);
COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], bank_nr); if (retval != ERROR_OK)
return retval;
for (p = flash_bank_list(); p; p = p->next, i++) if (p != NULL)
{ {
if (i != bank_nr)
continue;
char buf[1024]; char buf[1024];
/* attempt auto probe */ /* attempt auto probe */
@ -76,8 +73,8 @@ COMMAND_HANDLER(handle_flash_info_command)
return retval; return retval;
command_print(CMD_CTX, command_print(CMD_CTX,
"#%" PRIi32 " : %s at 0x%8.8" PRIx32 ", size 0x%8.8" PRIx32 ", buswidth %i, chipwidth %i", "#%" PRIu32 " : %s at 0x%8.8" PRIx32 ", size 0x%8.8" PRIx32 ", buswidth %i, chipwidth %i",
i, p->bank_number,
p->driver->name, p->driver->name,
p->base, p->base,
p->size, p->size,
@ -115,6 +112,7 @@ COMMAND_HANDLER(handle_flash_info_command)
COMMAND_HANDLER(handle_flash_probe_command) COMMAND_HANDLER(handle_flash_probe_command)
{ {
struct flash_bank *p;
int retval; int retval;
if (CMD_ARGC != 1) if (CMD_ARGC != 1)
@ -122,9 +120,10 @@ COMMAND_HANDLER(handle_flash_probe_command)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
} }
unsigned bank_nr; retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &p);
COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], bank_nr); if (retval != ERROR_OK)
struct flash_bank *p = get_flash_bank_by_num_noprobe(bank_nr); return retval;
if (p) if (p)
{ {
if ((retval = p->driver->probe(p)) == ERROR_OK) if ((retval = p->driver->probe(p)) == ERROR_OK)
@ -294,15 +293,13 @@ COMMAND_HANDLER(handle_flash_erase_command)
if (CMD_ARGC != 3) if (CMD_ARGC != 3)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
uint32_t bank_nr;
uint32_t first; uint32_t first;
uint32_t last; uint32_t last;
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], bank_nr);
struct flash_bank *p; struct flash_bank *p;
int retval; int retval;
retval = get_flash_bank_by_num(bank_nr, &p);
retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &p);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -325,7 +322,7 @@ COMMAND_HANDLER(handle_flash_erase_command)
{ {
command_print(CMD_CTX, "erased sectors %" PRIu32 " " command_print(CMD_CTX, "erased sectors %" PRIu32 " "
"through %" PRIu32" on flash bank %" PRIu32 " " "through %" PRIu32" on flash bank %" PRIu32 " "
"in %fs", first, last, bank_nr, duration_elapsed(&bench)); "in %fs", first, last, p->bank_number, duration_elapsed(&bench));
} }
return ERROR_OK; return ERROR_OK;
@ -336,13 +333,13 @@ COMMAND_HANDLER(handle_flash_protect_command)
if (CMD_ARGC != 4) if (CMD_ARGC != 4)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
uint32_t bank_nr;
uint32_t first; uint32_t first;
uint32_t last; uint32_t last;
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], bank_nr);
struct flash_bank *p; struct flash_bank *p;
int retval = get_flash_bank_by_num(bank_nr, &p); int retval;
retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &p);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -362,9 +359,9 @@ COMMAND_HANDLER(handle_flash_protect_command)
retval = flash_driver_protect(p, set, first, last); retval = flash_driver_protect(p, set, first, last);
if (retval == ERROR_OK) { if (retval == ERROR_OK) {
command_print(CMD_CTX, "%s protection for sectors %i " command_print(CMD_CTX, "%s protection for sectors %i "
"through %i on flash bank %i", "through %i on flash bank %" PRIu32 "",
(set) ? "set" : "cleared", (int) first, (set) ? "set" : "cleared", (int) first,
(int) last, (int) bank_nr); (int) last, p->bank_number);
} }
return ERROR_OK; return ERROR_OK;
@ -847,8 +844,8 @@ COMMAND_HANDLER(handle_flash_banks_command)
unsigned n = 0; unsigned n = 0;
for (struct flash_bank *p = flash_bank_list(); p; p = p->next, n++) for (struct flash_bank *p = flash_bank_list(); p; p = p->next, n++)
{ {
LOG_USER("#%u: %s at 0x%8.8" PRIx32 ", size 0x%8.8" PRIx32 ", " LOG_USER("#%" PRIu32 " : %s at 0x%8.8" PRIx32 ", size 0x%8.8" PRIx32 ", "
"buswidth %u, chipwidth %u", n, "buswidth %u, chipwidth %u", p->bank_number,
p->driver->name, p->base, p->size, p->driver->name, p->base, p->size,
p->bus_width, p->chip_width); p->bus_width, p->chip_width);
} }