Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
add flash/nor/{tcl.c,imp.h} from flash/flash.c
[openocd.git] / src / flash / flash.c
diff --git a/src/flash/flash.c b/src/flash/flash.c
index 4584c5d03ee6f4fc958f4252d97383a22bd46ae8..b21838cfaaad3086d196de71bd8e52f6fb838fb5 100644 (file)
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -29,8 +29,8 @@
 
 #include "flash.h"
 #include "common.h"
-#include "image.h"
-#include "time_support.h"
+#include <target/image.h>
+#include <helper/time_support.h>
 
 static int flash_write_unlock(struct target *target, struct image *image, uint32_t *written, int erase, bool unlock);
 
@@ -120,39 +120,6 @@ int flash_driver_protect(struct flash_bank *bank, int set, int first, int last)
        return retval;
 }
 
-static int jim_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
-{
-       struct flash_bank *p;
-
-       if (argc != 1) {
-               Jim_WrongNumArgs(interp, 1, argv, "no arguments to flash_banks command");
-               return JIM_ERR;
-       }
-
-       Jim_Obj *list = Jim_NewListObj(interp, NULL, 0);
-       for (p = flash_banks; p; p = p->next)
-       {
-               Jim_Obj *elem = Jim_NewListObj(interp, NULL, 0);
-
-               Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, "name", -1));
-               Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, p->driver->name, -1));
-               Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, "base", -1));
-               Jim_ListAppendElement(interp, elem, Jim_NewIntObj(interp, p->base));
-               Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, "size", -1));
-               Jim_ListAppendElement(interp, elem, Jim_NewIntObj(interp, p->size));
-               Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, "bus_width", -1));
-               Jim_ListAppendElement(interp, elem, Jim_NewIntObj(interp, p->bus_width));
-               Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, "chip_width", -1));
-               Jim_ListAppendElement(interp, elem, Jim_NewIntObj(interp, p->chip_width));
-
-               Jim_ListAppendElement(interp, list, elem);
-       }
-
-       Jim_SetResult(interp, list);
-
-       return JIM_OK;
-}
-
 struct flash_bank *get_flash_bank_by_num_noprobe(int num)
 {
        struct flash_bank *p;
@@ -238,92 +205,6 @@ COMMAND_HELPER(flash_command_get_bank, unsigned name_index,
 }
 
 
-COMMAND_HANDLER(handle_flash_bank_command)
-{
-       if (CMD_ARGC < 7)
-       {
-               LOG_ERROR("usage: flash bank <name> <driver> "
-                               "<base> <size> <chip_width> <bus_width>");
-               return ERROR_COMMAND_SYNTAX_ERROR;
-       }
-       // save bank name and advance arguments for compatibility
-       const char *bank_name = *CMD_ARGV++;
-       CMD_ARGC--;
-
-       struct target *target;
-       if ((target = get_target(CMD_ARGV[5])) == NULL)
-       {
-               LOG_ERROR("target '%s' not defined", CMD_ARGV[5]);
-               return ERROR_FAIL;
-       }
-
-       const char *driver_name = CMD_ARGV[0];
-       for (unsigned i = 0; flash_drivers[i]; i++)
-       {
-               if (strcmp(driver_name, flash_drivers[i]->name) != 0)
-                       continue;
-
-               /* register flash specific commands */
-               if (NULL != flash_drivers[i]->commands)
-               {
-                       int retval = register_commands(CMD_CTX, NULL,
-                                       flash_drivers[i]->commands);
-                       if (ERROR_OK != retval)
-                       {
-                               LOG_ERROR("couldn't register '%s' commands",
-                                               driver_name);
-                               return ERROR_FAIL;
-                       }
-               }
-
-               struct flash_bank *p, *c;
-               c = malloc(sizeof(struct flash_bank));
-               c->name = strdup(bank_name);
-               c->target = target;
-               c->driver = flash_drivers[i];
-               c->driver_priv = NULL;
-               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], c->base);
-               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], c->size);
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[3], c->chip_width);
-               COMMAND_PARSE_NUMBER(int, CMD_ARGV[4], c->bus_width);
-               c->num_sectors = 0;
-               c->sectors = NULL;
-               c->next = NULL;
-
-               int retval;
-               retval = CALL_COMMAND_HANDLER(flash_drivers[i]->flash_bank_command, c);
-               if (ERROR_OK != retval)
-               {
-                       LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32,
-                                       driver_name, c->base);
-                       free(c);
-                       return retval;
-               }
-
-               /* put flash bank in linked list */
-               if (flash_banks)
-               {
-                       int     bank_num = 0;
-                       /* find last flash bank */
-                       for (p = flash_banks; p && p->next; p = p->next) bank_num++;
-                       if (p)
-                               p->next = c;
-                       c->bank_number = bank_num + 1;
-               }
-               else
-               {
-                       flash_banks = c;
-                       c->bank_number = 0;
-               }
-
-               return ERROR_OK;
-       }
-
-       /* no matching flash driver found */
-       LOG_ERROR("flash driver '%s' not found", driver_name);
-       return ERROR_FAIL;
-}
-
 COMMAND_HANDLER(handle_flash_info_command)
 {
        struct flash_bank *p;
@@ -559,7 +440,7 @@ static int flash_check_sector_parameters(struct command_context *cmd_ctx,
 
 COMMAND_HANDLER(handle_flash_erase_command)
 {
-       if (CMD_ARGC != 2)
+       if (CMD_ARGC != 3)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        uint32_t bank_nr;
@@ -599,7 +480,7 @@ COMMAND_HANDLER(handle_flash_erase_command)
 
 COMMAND_HANDLER(handle_flash_protect_command)
 {
-       if (CMD_ARGC != 3)
+       if (CMD_ARGC != 4)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        uint32_t bank_nr;
@@ -1316,7 +1197,7 @@ static const struct command_registration flash_exec_command_handlers[] = {
                .name = "erase_address",
                .handler = &handle_flash_erase_address_command,
                .mode = COMMAND_EXEC,
-               .usage = "<bank> <address> <length>",
+               .usage = "<address> <length>",
                .help = "erase address range",
 
        },
@@ -1368,8 +1249,6 @@ static const struct command_registration flash_exec_command_handlers[] = {
 
 int flash_init_drivers(struct command_context *cmd_ctx)
 {
-       register_jim(cmd_ctx, "ocd_flash_banks",
-                       jim_flash_banks, "return information about the flash banks");
        if (!flash_banks)
                return ERROR_OK;
 
@@ -1377,31 +1256,3 @@ int flash_init_drivers(struct command_context *cmd_ctx)
        return register_commands(cmd_ctx, parent, flash_exec_command_handlers);
 }
 
-
-static const struct command_registration flash_config_command_handlers[] = {
-       {
-               .name = "bank",
-               .handler = &handle_flash_bank_command,
-               .mode = COMMAND_CONFIG,
-               .usage = "<name> <driver> <base> <size> "
-                       "<chip_width> <bus_width> <target> "
-                       "[driver_options ...]",
-               .help = "Define a new bank with the given name, "
-                       "using the specified NOR flash driver.",
-       },
-       COMMAND_REGISTRATION_DONE
-};
-static const struct command_registration flash_command_handlers[] = {
-       {
-               .name = "flash",
-               .mode = COMMAND_ANY,
-               .help = "NOR flash command group",
-               .chain = flash_config_command_handlers,
-       },
-       COMMAND_REGISTRATION_DONE
-};
-
-int flash_register_commands(struct command_context *cmd_ctx)
-{
-       return register_commands(cmd_ctx, NULL, flash_command_handlers);
-}
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)