move more nor flash implementation details
[openocd.git] / src / flash / flash.c
index 7336bbd79c474e700782e0c955c8f922d9cc52e5..2cf56ed57b9a250bbce76e20c258514132afacf0 100644 (file)
@@ -2,6 +2,12 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Ã˜yvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
 #endif
 
 #include "flash.h"
-#include "command.h"
-#include "target.h"
-#include "time_support.h"
-#include "fileio.h"
-#include "image.h"
-#include "log.h"
-
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <inttypes.h>
-
-/* command handlers */
-int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_flash_banks_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_flash_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_flash_auto_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr);
+#include "common.h"
+#include <target/image.h>
+#include <helper/time_support.h>
 
 /* flash drivers
  */
-extern flash_driver_t lpc2000_flash;
-extern flash_driver_t cfi_flash;
-extern flash_driver_t at91sam7_flash;
-extern flash_driver_t str7x_flash;
-extern flash_driver_t str9x_flash;
-extern flash_driver_t stellaris_flash;
-extern flash_driver_t str9xpec_flash;
-extern flash_driver_t stm32x_flash;
-
-flash_driver_t *flash_drivers[] =
-{
+extern struct flash_driver lpc2000_flash;
+extern struct flash_driver lpc288x_flash;
+extern struct flash_driver lpc2900_flash;
+extern struct flash_driver cfi_flash;
+extern struct flash_driver at91sam3_flash;
+extern struct flash_driver at91sam7_flash;
+extern struct flash_driver str7x_flash;
+extern struct flash_driver str9x_flash;
+extern struct flash_driver aduc702x_flash;
+extern struct flash_driver stellaris_flash;
+extern struct flash_driver str9xpec_flash;
+extern struct flash_driver stm32x_flash;
+extern struct flash_driver tms470_flash;
+extern struct flash_driver ecosflash_flash;
+extern struct flash_driver ocl_flash;
+extern struct flash_driver pic32mx_flash;
+extern struct flash_driver avr_flash;
+extern struct flash_driver faux_flash;
+
+struct flash_driver *flash_drivers[] = {
        &lpc2000_flash,
+       &lpc288x_flash,
+       &lpc2900_flash,
        &cfi_flash,
        &at91sam7_flash,
+       &at91sam3_flash,
        &str7x_flash,
        &str9x_flash,
+       &aduc702x_flash,
        &stellaris_flash,
        &str9xpec_flash,
        &stm32x_flash,
+       &tms470_flash,
+       &ecosflash_flash,
+       &ocl_flash,
+       &pic32mx_flash,
+       &avr_flash,
+       &faux_flash,
        NULL,
 };
 
-flash_bank_t *flash_banks;
-static         command_t *flash_cmd;
-static int auto_erase = 0;
-
-int flash_register_commands(struct command_context_s *cmd_ctx)
-{
-       flash_cmd = register_command(cmd_ctx, NULL, "flash", NULL, COMMAND_ANY, NULL);
-       
-       register_command(cmd_ctx, flash_cmd, "bank", handle_flash_bank_command, COMMAND_CONFIG, NULL);
-       
-       return ERROR_OK;
-}
+struct flash_bank *flash_banks;
 
-int flash_init_drivers(struct command_context_s *cmd_ctx)
+struct flash_bank *get_flash_bank_by_num_noprobe(int num)
 {
-       if (flash_banks)
-       {
-               register_command(cmd_ctx, flash_cmd, "banks", handle_flash_banks_command, COMMAND_EXEC,
-                                                "list configured flash banks ");
-               register_command(cmd_ctx, flash_cmd, "info", handle_flash_info_command, COMMAND_EXEC,
-                                                "print info about flash bank <num>");
-               register_command(cmd_ctx, flash_cmd, "probe", handle_flash_probe_command, COMMAND_EXEC,
-                                                "identify flash bank <num>");
-               register_command(cmd_ctx, flash_cmd, "erase_check", handle_flash_erase_check_command, COMMAND_EXEC,
-                                                "check erase state of sectors in flash bank <num>");
-               register_command(cmd_ctx, flash_cmd, "protect_check", handle_flash_protect_check_command, COMMAND_EXEC,
-                                                "check protection state of sectors in flash bank <num>");
-               register_command(cmd_ctx, flash_cmd, "erase", handle_flash_erase_command, COMMAND_EXEC,
-                                                "DEPRECATED, use 'erase_sector' instead");
-               register_command(cmd_ctx, flash_cmd, "erase_sector", handle_flash_erase_command, COMMAND_EXEC,
-                                                "erase sectors at <bank> <first> <last>");
-               register_command(cmd_ctx, flash_cmd, "erase_address", handle_flash_erase_address_command, COMMAND_EXEC,
-                                                "erase address range <address> <length>");
-               register_command(cmd_ctx, flash_cmd, "write", handle_flash_write_binary_command, COMMAND_EXEC,
-                                                "DEPRECATED, use 'write_binary' instead");
-               register_command(cmd_ctx, flash_cmd, "write_binary", handle_flash_write_binary_command, COMMAND_EXEC,
-                                                "write binary <bank> <file> <offset>");
-               register_command(cmd_ctx, flash_cmd, "write_image", handle_flash_write_image_command, COMMAND_EXEC,
-                                                "write_image <file> [offset] [type]");
-               register_command(cmd_ctx, flash_cmd, "protect", handle_flash_protect_command, COMMAND_EXEC,
-                                                "set protection of sectors at <bank> <first> <last> <on|off>");
-               register_command(cmd_ctx, flash_cmd, "auto_erase", handle_flash_auto_erase_command, COMMAND_EXEC,
-                                                "auto erase flash sectors <on|off>");
-       }
-       
-       return ERROR_OK;
-}
-
-flash_bank_t *get_flash_bank_by_num(int num)
-{
-       flash_bank_t *p;
+       struct flash_bank *p;
        int i = 0;
 
        for (p = flash_banks; p; p = p->next)
@@ -137,909 +89,171 @@ flash_bank_t *get_flash_bank_by_num(int num)
                        return p;
                }
        }
-       
+       LOG_ERROR("flash bank %d does not exist", num);
        return NULL;
 }
 
-/* flash_bank <driver> <base> <size> <chip_width> <bus_width> <target> [driver_options ...]
- */
-int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       int i;
-       int found = 0;
-       target_t *target;
-               
-       if (argc < 6)
-       {
-               WARNING("incomplete flash_bank configuration");
-               WARNING("flash_bank <driver> <base> <size> <chip_width> <bus_width> <target> [driver_options ...]");
-               return ERROR_OK;
-       }
-       
-       if ((target = get_target_by_num(strtoul(args[5], NULL, 0))) == NULL)
-       {
-               ERROR("target %lu not defined", strtoul(args[5], NULL, 0));
-               return ERROR_OK;
-       }
-       
-       for (i = 0; flash_drivers[i]; i++)
-       {
-               if (strcmp(args[0], flash_drivers[i]->name) == 0)
-               {
-                       flash_bank_t *p, *c;
-                       
-                       /* register flash specific commands */
-                       if (flash_drivers[i]->register_commands(cmd_ctx) != ERROR_OK)
-                       {
-                               ERROR("couldn't register '%s' commands", args[0]);
-                               exit(-1);
-                       }
-                       
-                       c = malloc(sizeof(flash_bank_t));
-                       c->target = target;
-                       c->driver = flash_drivers[i];
-                       c->driver_priv = NULL;
-                       c->base = strtoul(args[1], NULL, 0);
-                       c->size = strtoul(args[2], NULL, 0);
-                       c->chip_width = strtoul(args[3], NULL, 0);
-                       c->bus_width = strtoul(args[4], NULL, 0);
-                       c->num_sectors = 0;
-                       c->sectors = NULL;
-                       c->next = NULL;
-                       
-                       if (flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c) != ERROR_OK)
-                       {
-                               ERROR("'%s' driver rejected flash bank at 0x%8.8x", args[0], c->base);
-                               free(c);
-                               return ERROR_OK;
-                       }
-                       
-                       /* put flash bank in linked list */
-                       if (flash_banks)
-                       {
-                               /* find last flash bank */
-                               for (p = flash_banks; p && p->next; p = p->next);
-                               if (p)
-                                       p->next = c;
-                       }
-                       else
-                       {
-                               flash_banks = c;
-                       }
-                       
-                       found = 1;
-               }
-       }
-               
-       /* no matching flash driver found */
-       if (!found)
-       {
-               ERROR("flash driver '%s' not found", args[0]);
-               exit(-1);
-       }
-       
-       return ERROR_OK;
-}
-
-int handle_flash_banks_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+int flash_get_bank_count(void)
 {
-       flash_bank_t *p;
+       struct flash_bank *p;
        int i = 0;
-       
-       if (!flash_banks)
-       {
-               command_print(cmd_ctx, "no flash banks configured");
-               return ERROR_OK;
-       }
-       
        for (p = flash_banks; p; p = p->next)
        {
-               command_print(cmd_ctx, "#%i: %s at 0x%8.8x, size 0x%8.8x, buswidth %i, chipwidth %i",
-                                         i++, p->driver->name, p->base, p->size, p->bus_width, p->chip_width);
+               i++;
        }
-       
-       return ERROR_OK;
+       return i;
 }
 
-int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+struct flash_bank *get_flash_bank_by_name(const char *name)
 {
-       flash_bank_t *p;
-       int i = 0;
-       int j = 0;
-               
-       if (argc != 1)
-       {
-               command_print(cmd_ctx, "usage: flash info <num>");
-               return ERROR_OK;
-       }
-       
-       for (p = flash_banks; p; p = p->next, i++)
-       {
-               if (i == strtoul(args[0], NULL, 0))
-               {
-                       char buf[1024];
-                       
-                       command_print(cmd_ctx, "#%i: %s at 0x%8.8x, size 0x%8.8x, buswidth %i, chipwidth %i",
-                                               i, p->driver->name, p->base, p->size, p->bus_width, p->chip_width);
-                       for (j = 0; j < p->num_sectors; j++)
-                       {
-                               char *erase_state, *protect_state;
-                               
-                               if (p->sectors[j].is_erased == 0)
-                                       erase_state = "not erased";
-                               else if (p->sectors[j].is_erased == 1)
-                                       erase_state = "erased";
-                               else
-                                       erase_state = "erase state unknown";
-                               
-                               if (p->sectors[j].is_protected == 0)
-                                       protect_state = "not protected";
-                               else if (p->sectors[j].is_protected == 1)
-                                       protect_state = "protected";
-                               else
-                                       protect_state = "protection state unknown";
+       unsigned requested = get_flash_name_index(name);
+       unsigned found = 0;
 
-                               command_print(cmd_ctx, "\t#%i: 0x%8.8x (0x%x %ikB) %s, %s",
-                                                       j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10,
-                                                       erase_state, protect_state);
-                       }
-                       
-                       p->driver->info(p, buf, 1024);
-                       command_print(cmd_ctx, "%s", buf);
-               }
-       }
-       
-       return ERROR_OK;
-}
-
-int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       flash_bank_t *p;
-       int retval;
-               
-       if (argc != 1)
-       {
-               command_print(cmd_ctx, "usage: flash probe <num>");
-               return ERROR_OK;
-       }
-       
-       p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (p)
-       {
-               if ((retval = p->driver->probe(p)) == ERROR_OK)
-               {
-                       command_print(cmd_ctx, "flash '%s' found at 0x%8.8x", p->driver->name, p->base);
-               }
-               else if (retval == ERROR_FLASH_BANK_INVALID)
-               {
-                       command_print(cmd_ctx, "probing failed for flash bank '#%s' at 0x%8.8x",
-                                                 args[0], p->base);
-               }
-               else
-               {
-                       command_print(cmd_ctx, "unknown error when probing flash bank '#%s' at 0x%8.8x",
-                                                 args[0], p->base);
-               }
-       }
-       else
+       struct flash_bank *bank;
+       for (bank = flash_banks; NULL != bank; bank = bank->next)
        {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-       }
-       
-       return ERROR_OK;
-}
-
-int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       flash_bank_t *p;
-       int retval;
-               
-       if (argc != 1)
-       {
-               command_print(cmd_ctx, "usage: flash erase_check <num>");
-               return ERROR_OK;
-       }
-       
-       p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (p)
-       {
-               if ((retval = p->driver->erase_check(p)) == ERROR_OK)
-               {
-                       command_print(cmd_ctx, "successfully checked erase state", p->driver->name, p->base);
-               }
-               else
-               {
-                       command_print(cmd_ctx, "unknown error when checking erase state of flash bank #%s at 0x%8.8x",
-                               args[0], p->base);
-               }
-       }
-       else
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
+               if (strcmp(bank->name, name) == 0)
+                       return bank;
+               if (!flash_driver_name_matches(bank->driver->name, name))
+                       continue;
+               if (++found < requested)
+                       continue;
+               return bank;
        }
-       
-       return ERROR_OK;
+       return NULL;
 }
 
-int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+struct flash_bank *get_flash_bank_by_num(int num)
 {
-       flash_bank_t *p;
+       struct flash_bank *p = get_flash_bank_by_num_noprobe(num);
        int retval;
-       int address;
-       int length;
-       duration_t duration;
-       char *duration_text;
-       
-       target_t *target = get_current_target(cmd_ctx);
-
-       if (argc != 2)
-       {
-               command_print(cmd_ctx, "usage: flash erase_address <address> <length>");
-               return ERROR_OK;
-       }
-       
-       address = strtoul(args[0], NULL, 0);
-       length = strtoul(args[1], NULL, 0);
-       if (length <= 0)
-       {
-               command_print(cmd_ctx, "Length must be >0");
-               return ERROR_INVALID_ARGUMENTS;
-       }
 
-       p = get_flash_bank_by_addr(target, address);
        if (p == NULL)
-       {
-               command_print(cmd_ctx, "No flash at that address");
-               return ERROR_INVALID_ARGUMENTS;
-       }
-       
-       /* We can't know if we did a resume + halt, in which case we no longer know the erased state */
-       flash_set_dirty();
-       
-       duration_start_measure(&duration);
-       
-       if ((retval = flash_erase_address_range(target, address, length)) != ERROR_OK)
-       {
-               switch (retval)
-               {
-                       case ERROR_TARGET_NOT_HALTED:
-                               command_print(cmd_ctx, "can't work with this flash while target is running");
-                               break;
-                       case ERROR_INVALID_ARGUMENTS:
-                               command_print(cmd_ctx, "usage: flash erase_address <address> <length>");
-                               break;
-                       case ERROR_FLASH_BANK_INVALID:
-                               command_print(cmd_ctx, "no '%s' flash found at 0x%8.8x", p->driver->name, p->base);
-                               break;
-                       case ERROR_FLASH_OPERATION_FAILED:
-                               command_print(cmd_ctx, "flash erase error");
-                               break;
-                       case ERROR_FLASH_SECTOR_INVALID:
-                               command_print(cmd_ctx, "sector number(s) invalid");
-                               break;
-                       default:
-                               command_print(cmd_ctx, "unknown error");
-               }
-       }
-       else
-       {
-               duration_stop_measure(&duration, &duration_text);       
-               command_print(cmd_ctx, "erased address 0x%8.8x length %i in %s", address, length, duration_text);
-               free(duration_text);
-       }
-       
-       return retval;
-}
+               return NULL;
 
-int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       flash_bank_t *p;
-       int retval;
-               
-       if (argc != 1)
-       {
-               command_print(cmd_ctx, "usage: flash protect_check <num>");
-               return ERROR_OK;
-       }
-       
-       p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (p)
-       {
-               if ((retval = p->driver->protect_check(p)) == ERROR_OK)
-               {
-                       command_print(cmd_ctx, "successfully checked protect state");
-               }
-               else if (retval == ERROR_FLASH_OPERATION_FAILED)
-               {
-                       command_print(cmd_ctx, "checking protection state failed (possibly unsupported) by flash #%s at 0x%8.8x", args[0], p->base);
-               }
-               else
-               {
-                       command_print(cmd_ctx, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8x", args[0], p->base);
-               }
-       }
-       else
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-       }
-       
-       return ERROR_OK;
-}
-
-int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       if (argc > 2)
-       {
-               int first = strtoul(args[1], NULL, 0);
-               int last = strtoul(args[2], NULL, 0);
-               int retval;
-               flash_bank_t *p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-               duration_t duration;
-               char *duration_text;
-       
-               duration_start_measure(&duration);
-       
-               if (!p)
-               {
-                       command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-                       return ERROR_OK;
-               }
-               
-               if ((retval = p->driver->erase(p, first, last)) != ERROR_OK)
-               {
-                       switch (retval)
-                       {
-                               case ERROR_TARGET_NOT_HALTED:
-                                       command_print(cmd_ctx, "can't work with this flash while target is running");
-                                       break;
-                               case ERROR_INVALID_ARGUMENTS:
-                                       command_print(cmd_ctx, "usage: flash_erase <bank> <first> <last>");
-                                       break;
-                               case ERROR_FLASH_BANK_INVALID:
-                                       command_print(cmd_ctx, "no '%s' flash found at 0x%8.8x", p->driver->name, p->base);
-                                       break;
-                               case ERROR_FLASH_OPERATION_FAILED:
-                                       command_print(cmd_ctx, "flash erase error");
-                                       break;
-                               case ERROR_FLASH_SECTOR_INVALID:
-                                       command_print(cmd_ctx, "sector number(s) invalid");
-                                       break;
-                               case ERROR_OK:
-                                       command_print(cmd_ctx, "erased flash sectors %i to %i", first, last);
-                                       break;
-                               default:
-                                       command_print(cmd_ctx, "unknown error");
-                       }
-               }
-               else
-               {
-                       duration_stop_measure(&duration, &duration_text);       
-                       
-                       command_print(cmd_ctx, "erased sectors %i through %i on flash bank %i in %s", first, last, strtoul(args[0], 0, 0), duration_text);
-                       free(duration_text);
-               }
-       }
-       else
-       {
-               command_print(cmd_ctx, "usage: flash erase <bank> <first> <last>");
-       }
+       retval = p->driver->auto_probe(p);
 
-       return ERROR_OK;
-}
-
-int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       if (argc > 3)
-       {
-               int first = strtoul(args[1], NULL, 0);
-               int last = strtoul(args[2], NULL, 0);
-               int set;
-               int retval;
-               flash_bank_t *p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-               if (!p)
-               {
-                       command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-                       return ERROR_OK;
-               }
-               
-               if (strcmp(args[3], "on") == 0)
-                       set = 1;
-               else if (strcmp(args[3], "off") == 0)
-                       set = 0;
-               else
-               {
-                       command_print(cmd_ctx, "usage: flash protect <bank> <first> <last> <on|off>");
-                       return ERROR_OK;
-               }
-               
-               if ((retval = p->driver->protect(p, set, first, last)) != ERROR_OK)
-               {
-                       switch (retval)
-                       {
-                               case ERROR_TARGET_NOT_HALTED:
-                                       command_print(cmd_ctx, "can't work with this flash while target is running");
-                                       break;
-                               case ERROR_INVALID_ARGUMENTS:
-                                       command_print(cmd_ctx, "usage: flash protect <bank> <first> <last> <on|off>");
-                                       break;
-                               case ERROR_FLASH_BANK_INVALID:
-                                       command_print(cmd_ctx, "no '%s' flash found at 0x%8.8x", p->driver->name, p->base);
-                                       break;
-                               case ERROR_FLASH_OPERATION_FAILED:
-                                       command_print(cmd_ctx, "flash program error");
-                                       break;
-                               case ERROR_FLASH_SECTOR_INVALID:
-                                       command_print(cmd_ctx, "sector number(s) invalid");
-                                       break;
-                               case ERROR_OK:
-                                       command_print(cmd_ctx, "protection of flash sectors %i to %i turned %s", first, last, args[3]);
-                                       break;
-                               default:
-                                       command_print(cmd_ctx, "unknown error");
-                       }
-               }
-               else
-               {
-                       command_print(cmd_ctx, "%s protection for sectors %i through %i on flash bank %i", (set) ? "set" : "cleared", first, last, strtoul(args[0], 0, 0));
-               }
-       }
-       else
-       {
-               command_print(cmd_ctx, "usage: flash protect <bank> <first> <last> <on|off>");
-       }
-
-       return ERROR_OK;
-}
-
-int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       target_t *target = get_current_target(cmd_ctx);
-       
-       image_t image;
-       u32 written;
-       char *error_str;
-       int *failed;
-       
-       int i;
-       
-       duration_t duration;
-       char *duration_text;
-       
-       int retval;
-
-       if (argc < 1)
-       {
-               command_print(cmd_ctx, "usage: flash %s <file> [offset] [type]", cmd);
-               return ERROR_INVALID_ARGUMENTS;
-       }
-       
-       if (!target)
-       {
-               ERROR("no target selected");
-               return ERROR_OK;
-       }
-       
-       duration_start_measure(&duration);
-       
-       if (argc >= 2)
-       {
-               image.base_address_set = 1;
-               image.base_address = strtoul(args[1], NULL, 0);
-       }
-       else
-       {
-               image.base_address_set = 0;
-               image.base_address = 0x0;
-       }
-       
-       image.start_address_set = 0;
-
-       retval = image_open(&image, args[0], (argc == 3) ? args[2] : NULL);
        if (retval != ERROR_OK)
        {
-               command_print(cmd_ctx, "image_open error: %s", image.error_str);
-               return retval;
-       }
-       
-       failed = malloc(sizeof(int) * image.num_sections);
-
-       error_str = NULL;
-               
-       retval = flash_write(target, &image, &written, &error_str, failed, auto_erase);
-       
-       if (retval != ERROR_OK)
-       {
-               if (error_str)
-               {
-                       command_print(cmd_ctx, "failed writing image %s: %s", args[0], error_str);
-                       free(error_str);
-               }
-               image_close(&image);
-               free(failed);
-               return retval;
-       }
-       
-       for (i = 0; i < image.num_sections; i++)
-       {
-               if (failed[i])
-               {
-                       command_print(cmd_ctx, "didn't write section at 0x%8.8x, size 0x%8.8x",
-                                       image.sections[i].base_address, image.sections[i].size);
-               }
-       }
-       
-       duration_stop_measure(&duration, &duration_text);
-       command_print(cmd_ctx, "wrote %u byte from file %s in %s (%f kb/s)",
-               written, args[0], duration_text,
-               (float)written / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0)));
-       free(duration_text);
-       free(failed);
-
-       image_close(&image);
-       
-       return ERROR_OK;
-}
-
-int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       u32 offset;
-       u8 *buffer;
-       u32 buf_cnt;
-
-       fileio_t fileio;
-       
-       duration_t duration;
-       char *duration_text;
-       
-       int retval;
-       flash_bank_t *p;
-
-       if (argc < 3)
-       {
-               command_print(cmd_ctx, "usage: flash write_binary <bank> <file> <offset>");
-               return ERROR_OK;
-       }
-       
-       duration_start_measure(&duration);
-       
-       offset = strtoul(args[2], NULL, 0);
-       p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!p)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
-       
-       if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
-       {
-               command_print(cmd_ctx, "flash write_binary error: %s", fileio.error_str);
-               return ERROR_OK;
-       }
-       
-       buffer = malloc(fileio.size);
-       if (fileio_read(&fileio, fileio.size, buffer, &buf_cnt) != ERROR_OK)
-       {
-               command_print(cmd_ctx, "flash write_binary error: %s", fileio.error_str);
-               return ERROR_OK;
-       }
-       
-       if ((retval = p->driver->write(p, buffer, offset, buf_cnt)) != ERROR_OK)
-       {
-               command_print(cmd_ctx, "failed writing file %s to flash bank %i at offset 0x%8.8x",
-                       args[1], strtoul(args[0], NULL, 0), strtoul(args[2], NULL, 0));
-               
-               switch (retval)
-               {
-                       case ERROR_TARGET_NOT_HALTED:
-                               command_print(cmd_ctx, "can't work with this flash while target is running");
-                               break;
-                       case ERROR_INVALID_ARGUMENTS:
-                               command_print(cmd_ctx, "usage: flash write <bank> <file> <offset>");
-                               break;
-                       case ERROR_FLASH_BANK_INVALID:
-                               command_print(cmd_ctx, "no '%s' flash found at 0x%8.8x", p->driver->name, p->base);
-                               break;
-                       case ERROR_FLASH_OPERATION_FAILED:
-                               command_print(cmd_ctx, "flash program error");
-                               break;
-                       case ERROR_FLASH_DST_BREAKS_ALIGNMENT:
-                               command_print(cmd_ctx, "offset breaks required alignment");
-                               break;
-                       case ERROR_FLASH_DST_OUT_OF_BANK:
-                               command_print(cmd_ctx, "destination is out of flash bank (offset and/or file too large)");
-                               break;
-                       case ERROR_FLASH_SECTOR_NOT_ERASED:
-                               command_print(cmd_ctx, "destination sector(s) not erased");
-                               break;
-                       default:
-                               command_print(cmd_ctx, "unknown error");
-               }
-       }
-
-       free(buffer);
-       
-       duration_stop_measure(&duration, &duration_text);
-       command_print(cmd_ctx, "wrote  %"PRIi64" byte from file %s to flash bank %i at offset 0x%8.8x in %s (%f kb/s)",
-               fileio.size, args[1], strtoul(args[0], NULL, 0), offset, duration_text,
-               (float)fileio.size / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0)));
-       free(duration_text);
-
-       fileio_close(&fileio);
-       
-       return ERROR_OK;
-}
-
-void flash_set_dirty(void)
-{
-       flash_bank_t *c;
-       int i;
-       
-       /* set all flash to require erasing */
-       for (c = flash_banks; c; c = c->next)
-       {
-               for (i = 0; i < c->num_sectors; i++)
-               {
-                       c->sectors[i].is_erased = 0; 
-               }
+               LOG_ERROR("auto_probe failed %d\n", retval);
+               return NULL;
        }
+       return p;
 }
 
 /* lookup flash bank by address */
-flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr)
+struct flash_bank *get_flash_bank_by_addr(struct target *target, uint32_t addr)
 {
-       flash_bank_t *c;
+       struct flash_bank *c;
 
        /* cycle through bank list */
        for (c = flash_banks; c; c = c->next)
        {
+               int retval;
+               retval = c->driver->auto_probe(c);
+
+               if (retval != ERROR_OK)
+               {
+                       LOG_ERROR("auto_probe failed %d\n", retval);
+                       return NULL;
+               }
                /* check whether address belongs to this flash bank */
-               if ((addr >= c->base) && (addr < c->base + c->size) && target == c->target)
+               if ((addr >= c->base) && (addr <= c->base + (c->size - 1)) && target == c->target)
                        return c;
        }
-
+       LOG_ERROR("No flash at address 0x%08" PRIx32 "\n", addr);
        return NULL;
 }
 
-/* erase given flash region, selects proper bank according to target and address */
-int flash_erase_address_range(target_t *target, u32 addr, u32 length)
+int default_flash_mem_blank_check(struct flash_bank *bank)
 {
-       flash_bank_t *c;
-       int first = -1;
-       int last = -1;
+       struct target *target = bank->target;
+       const int buffer_size = 1024;
        int i;
-       
-       if ((c = get_flash_bank_by_addr(target, addr)) == NULL)
-               return ERROR_FLASH_DST_OUT_OF_BANK; /* no corresponding bank found */
+       uint32_t nBytes;
+       int retval = ERROR_OK;
 
-       if (c->size == 0 || c->num_sectors == 0)
-               return ERROR_FLASH_BANK_INVALID;
-       
-       if (length == 0)
+       if (bank->target->state != TARGET_HALTED)
        {
-               /* special case, erase whole bank when length is zero */
-               if (addr != c->base)
-                       return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
-               
-               return c->driver->erase(c, 0, c->num_sectors - 1);
+               LOG_ERROR("Target not halted");
+               return ERROR_TARGET_NOT_HALTED;
        }
 
-       /* check whether it fits */
-       if (addr + length > c->base + c->size)
-               return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
-       
-       addr -= c->base;
-       
-       for (i = 0; i < c->num_sectors; i++)
-       {               
-               /* check whether sector overlaps with the given range and is not yet erased */
-               if (addr < c->sectors[i].offset + c->sectors[i].size && addr + length > c->sectors[i].offset && c->sectors[i].is_erased != 1) {
-                       /* if first is not set yet then this is the first sector */
-                       if (first == -1)
-                               first = i;
-                       last = i; /* and it is the last one so far in any case */
-               }
-       }
-       
-       if( first == -1 || last == -1 )
-               return ERROR_OK;
-       
-       return c->driver->erase(c, first, last);
-}
+       uint8_t *buffer = malloc(buffer_size);
 
-/* write (optional verify) an image to flash memory of the given target */
-int flash_write(target_t *target, image_t *image, u32 *written, char **error_str, int *failed, int erase)
-{
-       int retval;
-       int i;
-
-       int section;
-       u32 section_offset;
-       flash_bank_t *c;
-       
-       section = 0;
-       section_offset = 0;
-
-       if (written)
-               *written = 0;
-       
-       if (failed != NULL)
-               for (i = 0; i < image->num_sections; i++)
-                       failed[i] = 0;
-       
-       if (erase)
+       for (i = 0; i < bank->num_sectors; i++)
        {
-               /* assume all sectors need erasing - stops any problems
-                * when flash_write is called multiple times */
-               
-               flash_set_dirty();
-       }
-       
-       /* loop until we reach end of the image */
-       while (section < image->num_sections)
-       {
-               u32 buffer_size;
-               u8 *buffer;
-               int section_first;
-               int section_last;
-               u32 run_address = image->sections[section].base_address + section_offset;
-               u32 run_size = image->sections[section].size - section_offset;
-
-               if (image->sections[section].size ==  0)
-               {
-                       WARNING("empty section %d", section);
-                       section++;
-                       section_offset = 0;
-                       continue;
-               }
+               uint32_t j;
+               bank->sectors[i].is_erased = 1;
 
-               /* find the corresponding flash bank */
-               if ((c = get_flash_bank_by_addr(target, run_address)) == NULL)
+               for (j = 0; j < bank->sectors[i].size; j += buffer_size)
                {
-                       if (failed == NULL)
+                       uint32_t chunk;
+                       chunk = buffer_size;
+                       if (chunk > (j - bank->sectors[i].size))
                        {
-                               if (error_str == NULL)
-                                       return ERROR_FLASH_DST_OUT_OF_BANK; /* abort operation */
-                               *error_str = malloc(FLASH_MAX_ERROR_STR);
-                               snprintf(*error_str, FLASH_MAX_ERROR_STR, "no flash mapped at requested address");
-                               return ERROR_FLASH_DST_OUT_OF_BANK; /* abort operation */
+                               chunk = (j - bank->sectors[i].size);
                        }
-                       failed[section] = ERROR_FLASH_DST_OUT_OF_BANK; /* mark the section as failed */
-                       section++; /* and skip it */
-                       section_offset = 0;
-                       continue;
-               }
 
-               /* collect consecutive sections which fall into the same bank */
-               section_first = section;
-               section_last = section;
-               while ((run_address + run_size < c->base + c->size)
-                               && (section_last + 1 < image->num_sections))
-               {
-                       if (image->sections[section_last + 1].base_address < (run_address + run_size))
+                       retval = target_read_memory(target, bank->base + bank->sectors[i].offset + j, 4, chunk/4, buffer);
+                       if (retval != ERROR_OK)
                        {
-                               DEBUG("section %d out of order(very slightly surprising, but supported)", section_last + 1);
-                               break;
+                               goto done;
                        }
-                       if (image->sections[section_last + 1].base_address != (run_address + run_size))
-                               break;
-                       run_size += image->sections[++section_last].size;
-               }
 
-               /* fit the run into bank constraints */
-               if (run_address + run_size > c->base + c->size)
-                       run_size = c->base + c->size - run_address;
-
-               /* allocate buffer */
-               buffer = malloc(run_size);
-               buffer_size = 0;
-
-               /* read sections to the buffer */
-               while (buffer_size < run_size)
-               {
-                       u32 size_read;
-                       
-                       if (buffer_size - run_size <= image->sections[section].size - section_offset)
-                               size_read = buffer_size - run_size;
-                       else
-                               size_read = image->sections[section].size - section_offset;
-                       
-                       if ((retval = image_read_section(image, section, section_offset,
-                                       size_read, buffer + buffer_size, &size_read)) != ERROR_OK || size_read == 0)
+                       for (nBytes = 0; nBytes < chunk; nBytes++)
                        {
-                               free(buffer);
-                               
-                               if (error_str == NULL)
-                                       return ERROR_IMAGE_TEMPORARILY_UNAVAILABLE;
-                               
-                               *error_str = malloc(FLASH_MAX_ERROR_STR);
-                               
-                               /* if image_read_section returned an error there's an error string we can pass on */
-                               if (retval != ERROR_OK)
-                                       snprintf(*error_str, FLASH_MAX_ERROR_STR, "error reading from image: %s", image->error_str);
-                               else
-                                       snprintf(*error_str, FLASH_MAX_ERROR_STR, "error reading from image");
-                               
-                               return ERROR_IMAGE_TEMPORARILY_UNAVAILABLE;
+                               if (buffer[nBytes] != 0xFF)
+                               {
+                                       bank->sectors[i].is_erased = 0;
+                                       break;
+                               }
                        }
+               }
+       }
 
-                       buffer_size += size_read;
-                       section_offset += size_read;
+       done:
+       free(buffer);
 
-                       if (section_offset >= image->sections[section].size)
-                       {
-                               section++;
-                               section_offset = 0;
-                       }
-               }
+       return retval;
+}
 
-               retval = ERROR_OK;
-               
-               if (erase)
-               {
-                       /* calculate and erase sectors */
-                       retval = flash_erase_address_range( target, run_address, run_size );
-               }
-               
-               if (retval == ERROR_OK)
-               {
-                       /* write flash sectors */
-                       retval = c->driver->write(c, buffer, run_address - c->base, run_size);
-               }
-               
-               free(buffer);
+int default_flash_blank_check(struct flash_bank *bank)
+{
+       struct target *target = bank->target;
+       int i;
+       int retval;
+       int fast_check = 0;
+       uint32_t blank;
 
-               if (retval != ERROR_OK)
-               {
-                       if (error_str == NULL)
-                               return retval; /* abort operation */
+       if (bank->target->state != TARGET_HALTED)
+       {
+               LOG_ERROR("Target not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
 
-                       *error_str = malloc(FLASH_MAX_ERROR_STR);
-                       switch (retval)
-                       {
-                               case ERROR_TARGET_NOT_HALTED:
-                                       snprintf(*error_str, FLASH_MAX_ERROR_STR, "can't flash image while target is running");
-                                       break;
-                               case ERROR_INVALID_ARGUMENTS:
-                                       snprintf(*error_str, FLASH_MAX_ERROR_STR, "flash driver can't fulfill request");
-                                       break;
-                               case ERROR_FLASH_OPERATION_FAILED:
-                                       snprintf(*error_str, FLASH_MAX_ERROR_STR, "flash program error");
-                                       break;
-                               case ERROR_FLASH_DST_BREAKS_ALIGNMENT:
-                                       snprintf(*error_str, FLASH_MAX_ERROR_STR, "offset breaks required alignment");
-                                       break;
-                               case ERROR_FLASH_DST_OUT_OF_BANK:
-                                       snprintf(*error_str, FLASH_MAX_ERROR_STR, "no flash mapped at requested address");
-                                       break;
-                               case ERROR_FLASH_SECTOR_NOT_ERASED:
-                                       snprintf(*error_str, FLASH_MAX_ERROR_STR, "destination sector(s) not erased");
-                                       break;
-                               default:
-                                       snprintf(*error_str, FLASH_MAX_ERROR_STR, "unknown error: %i", retval);
-                       }
+       for (i = 0; i < bank->num_sectors; i++)
+       {
+               uint32_t address = bank->base + bank->sectors[i].offset;
+               uint32_t size = bank->sectors[i].size;
 
-                       return retval; /* abort operation */
+               if ((retval = target_blank_check_memory(target, address, size, &blank)) != ERROR_OK)
+               {
+                       fast_check = 0;
+                       break;
                }
-
-               if (written != NULL)
-                       *written += run_size; /* add run size to total written counter */
+               if (blank == 0xFF)
+                       bank->sectors[i].is_erased = 1;
+               else
+                       bank->sectors[i].is_erased = 0;
+               fast_check = 1;
        }
 
-       return ERROR_OK;
-}
-
-int handle_flash_auto_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       if (argc != 1)
+       if (!fast_check)
        {
-               command_print(cmd_ctx, "usage: flash auto_erase <on|off>");
-               return ERROR_OK;
+               LOG_USER("Running slow fallback erase check - add working memory");
+               return default_flash_mem_blank_check(bank);
        }
-       
-       if (strcmp(args[0], "on") == 0)
-               auto_erase = 1;
-       else if (strcmp(args[0], "off") == 0)
-               auto_erase = 0;
-       
+
        return ERROR_OK;
 }

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)