stellaris: avoid chip writes

[openocd] / src / flash / nor / tcl.c

diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index 6598652c2bbf5da16b0c5e16d04b89b5d8d39268..1e933b2733a36bd7a2e1671771c60acf8ddc029f 100644 (file)
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -697,21 +697,21 @@ static const struct command_registration flash_exec_command_handlers[] = {
                .name = "fillw",
                .handler = &handle_flash_fill_command,
                .mode = COMMAND_EXEC,
-               .usage = "<bank> <address> <word_pattern> <count>",
+               .usage = "<address> <word_pattern> <count>",
                .help = "fill with pattern (no autoerase)",
        },
        {
                .name = "fillh",
                .handler = &handle_flash_fill_command,
                .mode = COMMAND_EXEC,
-               .usage = "<bank> <address> <halfword_pattern> <count>",
+               .usage = "<address> <halfword_pattern> <count>",
                .help = "fill with pattern",
        },
        {
                .name = "fillb",
                .handler = &handle_flash_fill_command,
                .mode = COMMAND_EXEC,
-               .usage = "<bank> <address> <byte_pattern> <count>",
+               .usage = "<address> <byte_pattern> <count>",
                .help = "fill with pattern",
 
        },
@@ -726,7 +726,7 @@ static const struct command_registration flash_exec_command_handlers[] = {
                .name = "write_image",
                .handler = &handle_flash_write_image_command,
                .mode = COMMAND_EXEC,
-               .usage = "<bank> [erase] [unlock] <file> [offset] [type]",
+               .usage = "[erase] [unlock] <file> [offset] [type]",
                .help = "write an image to flash"
        },
        {
@@ -813,15 +813,33 @@ COMMAND_HANDLER(handle_flash_bank_command)
                return retval;
        }
 
-       return ERROR_OK;
+       flash_bank_add(c);
 
+       return ERROR_OK;
 }
 
+COMMAND_HANDLER(handle_flash_banks_command)
+{
+       if (CMD_ARGC != 0)
+               return ERROR_INVALID_ARGUMENTS;
+
+       unsigned n = 0;
+       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 ", "
+                       "buswidth %u, chipwidth %u", n,
+                       p->driver->name, p->base, p->size,
+                       p->bus_width, p->chip_width);
+       }
+       return ERROR_OK;
+}
 
-static int jim_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+static int jim_flash_list(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
-       if (argc != 1) {
-               Jim_WrongNumArgs(interp, 1, argv, "no arguments to flash_banks command");
+       if (argc != 1)
+       {
+               Jim_WrongNumArgs(interp, 1, argv,
+                               "no arguments to 'flash list' command");
                return JIM_ERR;
        }
 
@@ -888,8 +906,14 @@ static const struct command_registration flash_config_command_handlers[] = {
        {
                .name = "banks",
                .mode = COMMAND_ANY,
-               .jim_handler = &jim_flash_banks,
-               .help = "return information about the flash banks",
+               .handler = &handle_flash_banks_command,
+               .help = "return readable information about the flash banks",
+       },
+       {
+               .name = "list",
+               .mode = COMMAND_ANY,
+               .jim_handler = &jim_flash_list,
+               .help = "returns a list of details about the flash banks",
        },
        COMMAND_REGISTRATION_DONE
 };