Duane Ellis: fix warnings
[fw/openocd] / src / flash / flash.c
index 6f0523d0d631e09db33ccba175004c1e2df2b8dc..71d054f5051bde8f4056a8bbc2b932424d66d65e 100644 (file)
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Ã˜yvind Harboe                                      *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   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     *
 
 #include "flash.h"
 #include "command.h"
-#include "log.h"
 #include "target.h"
+#include "time_support.h"
+#include "fileio.h"
+#include "image.h"
+#include "log.h"
+#include "armv4_5.h"
+#include "algorithm.h"
+#include "binarybuffer.h"
+#include "armv7m.h"
 
 #include <string.h>
 #include <unistd.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_bank_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_fill_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);
+flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr);
 
 /* flash drivers
  */
@@ -50,6 +65,14 @@ 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;
+extern flash_driver_t tms470_flash;
+extern flash_driver_t ecosflash_flash;
+extern flash_driver_t lpc288x_flash;
+extern flash_driver_t ocl_flash;
 
 flash_driver_t *flash_drivers[] =
 {
@@ -57,27 +80,112 @@ flash_driver_t *flash_drivers[] =
        &cfi_flash,
        &at91sam7_flash,
        &str7x_flash,
+       &str9x_flash,
+       &stellaris_flash,
+       &str9xpec_flash,
+       &stm32x_flash,
+       &tms470_flash,
+       &ecosflash_flash,
+       &lpc288x_flash,
+       &ocl_flash,
        NULL,
 };
 
 flash_bank_t *flash_banks;
 static         command_t *flash_cmd;
 
+/* wafer thin wrapper for invoking the flash driver */
+static int flash_driver_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
+{
+       int retval;
+
+       retval=bank->driver->write(bank, buffer, offset, count);
+       if (retval!=ERROR_OK)
+       {
+               LOG_ERROR("error writing to flash at address 0x%08x at offset 0x%8.8x (%d)", bank->base, offset, retval);
+       }
+
+       return retval;
+}
+
+static int flash_driver_erase(struct flash_bank_s *bank, int first, int last)
+{
+       int retval;
+
+       retval=bank->driver->erase(bank, first, last);
+       if (retval!=ERROR_OK)
+       {
+               LOG_ERROR("failed erasing sectors %d to %d (%d)", first, last, retval);
+       }
+
+       return retval;
+}
+
+int flash_driver_protect(struct flash_bank_s *bank, int set, int first, int last)
+{
+       int retval;
+
+       retval=bank->driver->protect(bank, set, first, last);
+       if (retval!=ERROR_OK)
+       {
+               LOG_ERROR("failed setting protection for areas %d to %d (%d)", first, last, retval);
+       }
+
+       return retval;
+}
+
 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);
-       
+
+       register_command(cmd_ctx, flash_cmd, "bank", handle_flash_bank_command, COMMAND_CONFIG, "flash_bank <driver> <base> <size> <chip_width> <bus_width> <target> [driver_options ...]");
        return ERROR_OK;
 }
 
-int flash_init(struct command_context_s *cmd_ctx)
+static int jim_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       flash_bank_t *p;
+       
+       if (argc != 1) {
+               Jim_WrongNumArgs(interp, 1, argv, "no arguments to flash_banks command");
+               return JIM_ERR;
+       }
+
+       if (!flash_banks)
+       {
+               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;
+}
+
+int flash_init_drivers(struct command_context_s *cmd_ctx)
 {
        if (flash_banks)
        {
-               register_command(cmd_ctx, flash_cmd, "banks", handle_flash_banks_command, COMMAND_EXEC,
-                                                "list configured flash banks ");
+               register_jim(cmd_ctx, "ocd_flash_banks", jim_flash_banks, "return information about the 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,
@@ -86,18 +194,30 @@ int flash_init(struct command_context_s *cmd_ctx)
                                                 "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,
+               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, "write", handle_flash_write_command, COMMAND_EXEC,
-                                                "write binary <bank> <file> <offset>");
+               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, "fillw", handle_flash_fill_command, COMMAND_EXEC,
+                                                "fill with pattern <address> <word_pattern> <count>");
+               register_command(cmd_ctx, flash_cmd, "fillh", handle_flash_fill_command, COMMAND_EXEC,
+                                                "fill with pattern <address> <halfword_pattern> <count>");
+               register_command(cmd_ctx, flash_cmd, "fillb", handle_flash_fill_command, COMMAND_EXEC,
+                                                "fill with pattern <address> <byte_pattern> <count>");
+
+               register_command(cmd_ctx, flash_cmd, "write_bank", handle_flash_write_bank_command, COMMAND_EXEC,
+                                                "write binary data to <bank> <file> <offset>");
+               register_command(cmd_ctx, flash_cmd, "write_image", handle_flash_write_image_command, COMMAND_EXEC,
+                                                "write_image [erase] <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>");
        }
-       
+
        return ERROR_OK;
 }
 
-flash_bank_t *get_flash_bank_by_num(int num)
+flash_bank_t *get_flash_bank_by_num_noprobe(int num)
 {
        flash_bank_t *p;
        int i = 0;
@@ -109,52 +229,88 @@ 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> [driver_options ...]
- */
+int flash_get_bank_count(void)
+{
+       flash_bank_t *p;
+       int i = 0;
+       for (p = flash_banks; p; p = p->next)
+       {
+               i++;
+       }
+       return i;
+}
+
+flash_bank_t *get_flash_bank_by_num(int num)
+{
+       flash_bank_t *p = get_flash_bank_by_num_noprobe(num);
+       int retval;
+
+       if (p == NULL)
+               return NULL;
+
+       retval = p->driver->auto_probe(p);
+
+       if (retval != ERROR_OK)
+       {
+               LOG_ERROR("auto_probe failed %d\n", retval);
+               return NULL;
+       }
+       return p;
+}
+
 int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        int i;
        int found = 0;
-               
-       if (argc < 5)
+       target_t *target;
+
+       if (argc < 6)
+       {
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       }
+
+       if ((target = get_target_by_num(strtoul(args[5], NULL, 0))) == NULL)
        {
-               WARNING("incomplete flash_bank configuration");
+               LOG_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]);
+                               LOG_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);
+                               LOG_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)
                        {
@@ -167,38 +323,18 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char
                        {
                                flash_banks = c;
                        }
-                       
+
                        found = 1;
                }
        }
-               
+
        /* no matching flash driver found */
        if (!found)
        {
-               ERROR("flash driver '%s' not found", args[0]);
+               LOG_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)
-{
-       flash_bank_t *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);
-       }
-       
        return ERROR_OK;
 }
 
@@ -207,32 +343,29 @@ int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char
        flash_bank_t *p;
        int i = 0;
        int j = 0;
-               
+       int retval;
+
        if (argc != 1)
        {
-               command_print(cmd_ctx, "usage: flash info <num>");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
-       
-       for (p = flash_banks; p; p = p->next)
+
+       for (p = flash_banks; p; p = p->next, i++)
        {
-               if (i++ == strtoul(args[0], NULL, 0))
+               if (i == strtoul(args[0], NULL, 0))
                {
                        char buf[1024];
-                       
+
+                       /* attempt auto probe */
+                       if ((retval = p->driver->auto_probe(p)) != ERROR_OK)
+                               return retval;
+
                        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";
-                               
+                               char *protect_state;
+
                                if (p->sectors[j].is_protected == 0)
                                        protect_state = "not protected";
                                else if (p->sectors[j].is_protected == 1)
@@ -240,16 +373,19 @@ int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char
                                else
                                        protect_state = "protection state unknown";
 
-                               command_print(cmd_ctx, "\t#%i: 0x%8.8x (0x%xkB) %s, %s",
-                                                       j, p->sectors[j].offset, p->sectors[j].size,
-                                                       erase_state, protect_state);
+                               command_print(cmd_ctx, "\t#%i: 0x%8.8x (0x%x %ikB) %s",
+                                                       j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10,
+                                                       protect_state);
                        }
-                       
-                       p->driver->info(p, buf, 1024);
+
+                       *buf = '\0'; /* initialize buffer, otherwise it migh contain garbage if driver function fails */
+                       retval = p->driver->info(p, buf, sizeof(buf));
                        command_print(cmd_ctx, "%s", buf);
+                       if (retval != ERROR_OK)
+                               LOG_ERROR("error retrieving flash info (%d)", retval);
                }
        }
-       
+
        return ERROR_OK;
 }
 
@@ -257,14 +393,13 @@ int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, cha
 {
        flash_bank_t *p;
        int retval;
-               
+
        if (argc != 1)
        {
-               command_print(cmd_ctx, "usage: flash probe <num>");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
-       
-       p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
+
+       p = get_flash_bank_by_num_noprobe(strtoul(args[0], NULL, 0));
        if (p)
        {
                if ((retval = p->driver->probe(p)) == ERROR_OK)
@@ -286,7 +421,7 @@ int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, cha
        {
                command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
        }
-       
+
        return ERROR_OK;
 }
 
@@ -294,16 +429,16 @@ int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cm
 {
        flash_bank_t *p;
        int retval;
-               
+
        if (argc != 1)
        {
-               command_print(cmd_ctx, "usage: flash erase_check <num>");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
-       
+
        p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
        if (p)
        {
+               int j;
                if ((retval = p->driver->erase_check(p)) == ERROR_OK)
                {
                        command_print(cmd_ctx, "successfully checked erase state", p->driver->name, p->base);
@@ -313,26 +448,83 @@ int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cm
                        command_print(cmd_ctx, "unknown error when checking erase state of flash bank #%s at 0x%8.8x",
                                args[0], p->base);
                }
+               
+               for (j = 0; j < p->num_sectors; j++)
+               {
+                       char *erase_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";
+
+                       command_print(cmd_ctx, "\t#%i: 0x%8.8x (0x%x %ikB) %s",
+                                               j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10,
+                                               erase_state);
+               }
+               
        }
-       else
+
+       return ERROR_OK;
+}
+
+int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+       flash_bank_t *p;
+       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, "flash bank '#%s' is out of bounds", args[0]);
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
-       
-       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_COMMAND_SYNTAX_ERROR;
+       }
+
+       p = get_flash_bank_by_addr(target, address);
+       if (p == NULL)
+       {
+               return ERROR_FAIL;
+       }
+
+       /* 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)
+       {
+               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;
 }
 
 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;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
-       
+
        p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
        if (p)
        {
@@ -351,9 +543,9 @@ int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *
        }
        else
        {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
-       
+
        return ERROR_OK;
 }
 
@@ -365,42 +557,27 @@ int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, cha
                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;
+                       return ERROR_COMMAND_SYNTAX_ERROR;
                }
-               
-               if ((retval = p->driver->erase(p, first, last)) != ERROR_OK)
+
+               if ((retval = flash_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");
-                       }
+                       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>");
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        return ERROR_OK;
@@ -420,72 +597,241 @@ int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, c
                        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;
+                       return ERROR_COMMAND_SYNTAX_ERROR;
                }
-               
-               if ((retval = p->driver->protect(p, set, first, last)) != ERROR_OK)
+
+               retval = flash_driver_protect(p, set, first, last);
+               if (retval == ERROR_OK)
+               {
+                       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
+       {
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       }
+
+       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;
+
+       duration_t duration;
+       char *duration_text;
+
+       int retval;
+
+       if (argc < 1)
+       {
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       }
+       
+       /* flash auto-erase is disabled by default*/
+       int auto_erase = 0;
+       
+       if (strcmp(args[0], "erase")==0)
+       {
+               auto_erase = 1;
+               args++;
+               argc--;
+               command_print(cmd_ctx, "auto erase enabled");
+       }
+       
+
+       if (argc < 1)
+       {
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       }
+       
+       if (!target)
+       {
+               LOG_ERROR("no target selected");
+               return ERROR_FAIL;
+       }
+
+       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)
+       {
+               return retval;
+       }
+
+       retval = flash_write(target, &image, &written, auto_erase);
+       if (retval != ERROR_OK)
+       {
+               image_close(&image);
+               return retval;
+       }
+
+       duration_stop_measure(&duration, &duration_text);
+       if (retval == ERROR_OK)
+       {
+               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);
+
+       image_close(&image);
+
+       return retval;
+}
+
+int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+       int err = ERROR_OK;
+       u32 address;
+       u32 pattern;
+       u32 count;
+       u8 chunk[1024];
+       u32 wrote = 0;
+       int chunk_count;
+       char *duration_text;
+       duration_t duration;
+       target_t *target = get_current_target(cmd_ctx);
+       u32 i;
+       int wordsize;
+       
+       if (argc != 3)
+       {
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       }
+       
+       address = strtoul(args[0], NULL, 0);
+       pattern = strtoul(args[1], NULL, 0);
+       count   = strtoul(args[2], NULL, 0);
+       
+       if(count == 0)
+               return ERROR_OK;
+
+
+       switch(cmd[4])
+       {
+       case 'w':
+               wordsize=4;
+               break;
+       case 'h':
+               wordsize=2;
+               break;
+       case 'b':
+               wordsize=1;
+               break;
+       default:
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       }
+       
+       chunk_count = MIN(count, (1024 / wordsize));
+       switch(wordsize)
+       {
+       case 4:
+               for(i = 0; i < chunk_count; i++)
+               {
+                       target_buffer_set_u32(target, chunk + i * wordsize, pattern);
+               }
+               break;
+       case 2:
+               for(i = 0; i < chunk_count; i++)
                {
-                       switch (retval)
+                       target_buffer_set_u16(target, chunk + i * wordsize, pattern);
+               }
+               break;
+       case 1:
+               memset(chunk, pattern, chunk_count);
+               break;
+       default:
+               LOG_ERROR("BUG: can't happen");
+               exit(-1);
+       }
+       
+       duration_start_measure(&duration);
+
+       flash_set_dirty();
+       err = flash_erase_address_range( target, address, count*wordsize );
+       if (err == ERROR_OK)
+       {
+               for (wrote=0; wrote<(count*wordsize); wrote+=sizeof(chunk))
+               { 
+                       int cur_size = MIN( (count*wordsize - wrote) , 1024 );
+                       if (err == ERROR_OK)
                        {
-                               case ERROR_TARGET_NOT_HALTED:
-                                       command_print(cmd_ctx, "can't work with this flash while target is running");
+                               flash_bank_t *bank;
+                               bank = get_flash_bank_by_addr(target, address);
+                               if(bank == NULL)
+                               {
+                                       err = ERROR_FAIL;
                                        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");
+                               }
+                               err = flash_driver_write(bank, chunk, address - bank->base + wrote, cur_size);
+                               wrote += cur_size;
                        }
+                       if (err!=ERROR_OK)
+                               break;
                }
        }
-       else
+       
+       duration_stop_measure(&duration, &duration_text);
+
+       if(err == ERROR_OK)
        {
-               command_print(cmd_ctx, "usage: flash protect <bank> <first> <last> <on|off>");
+               float speed;
+               speed=wrote / 1024.0;
+               speed/=((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0));
+               command_print(cmd_ctx, "wrote %d bytes to 0x%8.8x in %s (%f kb/s)",
+                       count*wordsize, address, duration_text,
+                       speed);
        }
-
+       free(duration_text);
        return ERROR_OK;
 }
 
-int handle_flash_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-       FILE *binary;
        u32 offset;
-       struct stat binary_stat;
-       u32 binary_size;
        u8 *buffer;
        u32 buf_cnt;
+
+       fileio_t fileio;
+
+       duration_t duration;
+       char *duration_text;
+
        int retval;
        flash_bank_t *p;
-       struct timeval start, end, duration;
 
-       gettimeofday(&start, NULL);
-               
-       if (argc < 3)
+       if (argc != 3)
        {
-               command_print(cmd_ctx, "usage: flash write <bank> <file> <offset>");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
-       
+
+       duration_start_measure(&duration);
+
        offset = strtoul(args[2], NULL, 0);
        p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
        if (!p)
@@ -493,74 +839,358 @@ int handle_flash_write_command(struct command_context_s *cmd_ctx, char *cmd, cha
                command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
                return ERROR_OK;
        }
-       
-       if (stat(args[1], &binary_stat) == -1)
+
+       if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
        {
-               ERROR("couldn't stat() %s: %s", args[1], strerror(errno));
                return ERROR_OK;
        }
 
-       if (S_ISDIR(binary_stat.st_mode))
+       buffer = malloc(fileio.size);
+       if (fileio_read(&fileio, fileio.size, buffer, &buf_cnt) != ERROR_OK)
        {
-               ERROR("%s is a directory", args[1]);
-               command_print(cmd_ctx,"%s is a directory", args[1]);
+               free(buffer);
+               fileio_close(&fileio);
                return ERROR_OK;
        }
-               
-       if (binary_stat.st_size == 0){
-               ERROR("Empty file %s", args[1]);
-               command_print(cmd_ctx,"Empty file %s", args[1]);
-               return ERROR_OK;
+
+       retval = flash_driver_write(p, buffer, offset, buf_cnt);
+
+       free(buffer);
+       buffer = NULL;
+
+       duration_stop_measure(&duration, &duration_text);
+       if (retval!=ERROR_OK)
+       {
+       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)));
        }
-               
-       if (!(binary = fopen(args[1], "rb")))
+       free(duration_text);
+
+       fileio_close(&fileio);
+
+       return retval;
+}
+
+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)
        {
-               ERROR("couldn't open %s: %s", args[1], strerror(errno));
-               command_print(cmd_ctx, "couldn't open %s", args[1]);
-               return ERROR_OK;
+               for (i = 0; i < c->num_sectors; i++)
+               {
+                       c->sectors[i].is_erased = 0;
+               }
        }
+}
 
-       binary_size = binary_stat.st_size;
-       buffer = malloc(binary_size);
-       buf_cnt = fread(buffer, 1, binary_size, binary);
+/* lookup flash bank by address */
+flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr)
+{
+       flash_bank_t *c;
 
-       if ((retval = p->driver->write(p, buffer, offset, buf_cnt)) != ERROR_OK)
+       /* cycle through bank list */
+       for (c = flash_banks; c; c = c->next)
        {
-               switch (retval)
+               int retval;
+               retval = c->driver->auto_probe(c);
+
+               if (retval != ERROR_OK)
                {
-                       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)");
+                       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)
+                       return c;
+       }
+       LOG_ERROR("No flash at address 0x%08x\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)
+{
+       flash_bank_t *c;
+       int first = -1;
+       int last = -1;
+       int i;
+
+       if ((c = get_flash_bank_by_addr(target, addr)) == NULL)
+               return ERROR_FLASH_DST_OUT_OF_BANK; /* no corresponding bank found */
+
+       if (c->size == 0 || c->num_sectors == 0)
+       {
+               LOG_ERROR("Bank is invalid");
+               return ERROR_FLASH_BANK_INVALID;
+       }
+
+       if (length == 0)
+       {
+               /* special case, erase whole bank when length is zero */
+               if (addr != c->base)
+                       return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
+
+               return flash_driver_erase(c, 0, c->num_sectors - 1);
+       }
+
+       /* 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 flash_driver_erase(c, first, last);
+}
+
+/* write (optional verify) an image to flash memory of the given target */
+int flash_write(target_t *target, image_t *image, u32 *written, int erase)
+{
+       int retval=ERROR_OK;
+
+       int section;
+       u32 section_offset;
+       flash_bank_t *c;
+       int *padding;
+       
+       section = 0;
+       section_offset = 0;
+
+       if (written)
+               *written = 0;
+
+       if (erase)
+       {
+               /* assume all sectors need erasing - stops any problems
+                * when flash_write is called multiple times */
+
+               flash_set_dirty();
+       }
+       
+       /* allocate padding array */
+       padding = malloc(image->num_sections * sizeof(padding));
+       
+       /* 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;
+               int pad_bytes = 0;
+               
+               if (image->sections[section].size ==  0)
+               {
+                       LOG_WARNING("empty section %d", section);
+                       section++;
+                       section_offset = 0;
+                       continue;
+               }
+
+               /* find the corresponding flash bank */
+               if ((c = get_flash_bank_by_addr(target, run_address)) == NULL)
+               {
+                       section++; /* and skip it */
+                       section_offset = 0;
+                       continue;
+               }
+
+               /* collect consecutive sections which fall into the same bank */
+               section_first = section;
+               section_last = section;
+               padding[section] = 0;
+               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))
+                       {
+                               LOG_DEBUG("section %d out of order(very slightly surprising, but supported)", section_last + 1);
                                break;
-                       case ERROR_FLASH_SECTOR_NOT_ERASED:
-                               command_print(cmd_ctx, "destination sector(s) not erased");
+                       }
+                       /* if we have multiple sections within our image, flash programming could fail due to alignment issues
+                        * attempt to rebuild a consecutive buffer for the flash loader */
+                       pad_bytes = (image->sections[section_last + 1].base_address) - (run_address + run_size);
+                       if ((run_address + run_size + pad_bytes) > (c->base + c->size))
                                break;
-                       default:
-                               command_print(cmd_ctx, "unknown error");
+                       padding[section_last] = pad_bytes;
+                       run_size += image->sections[++section_last].size;
+                       run_size += pad_bytes;
+                       padding[section_last] = 0;
+                       
+                       LOG_INFO("Padding image section %d with %d bytes", section_last-1, pad_bytes );
+               }
+
+               /* 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)
+                       {
+                               free(buffer);
+                               free(padding);
+                               return retval;
+                       }
+                       
+                       /* see if we need to pad the section */
+                       while (padding[section]--)
+                               buffer[size_read++] = 0xff;
+                       
+                       buffer_size += size_read;
+                       section_offset += size_read;
+
+                       if (section_offset >= image->sections[section].size)
+                       {
+                               section++;
+                               section_offset = 0;
+                       }
+               }
+
+               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 = flash_driver_write(c, buffer, run_address - c->base, run_size);
                }
+
+               free(buffer);
+
+               if (retval != ERROR_OK)
+               {
+                       free(padding);
+                       return retval; /* abort operation */
+               }
+
+               if (written != NULL)
+                       *written += run_size; /* add run size to total written counter */
        }
-       free(buffer);
-       fclose(binary);
        
-       gettimeofday(&end, NULL);       
-       timeval_subtract(&duration, &end, &start);
+       free(padding);
        
-       command_print(cmd_ctx, "wrote file %s to flash bank %i at offset 0x%8.8x in %is %ius", args[1], strtoul(args[0], NULL, 0), strtoul(args[2], NULL, 0), duration.tv_sec, duration.tv_usec);
+       return retval;
+}
+
+int default_flash_mem_blank_check(struct flash_bank_s *bank)
+{
+       target_t *target = bank->target;
+       u8 buffer[1024];
+       int buffer_size = sizeof(buffer);
+       int i;
+       int nBytes;
+       
+       if (bank->target->state != TARGET_HALTED)
+       {
+               return ERROR_TARGET_NOT_HALTED;
+       }
+       
+       for (i = 0; i < bank->num_sectors; i++)
+       {
+               int j;
+               bank->sectors[i].is_erased = 1;
+               
+               for (j = 0; j < bank->sectors[i].size; j += buffer_size)
+               {
+                       int chunk;
+                       int retval;
+                       chunk = buffer_size;
+                       if (chunk > (j - bank->sectors[i].size))
+                       {
+                               chunk = (j - bank->sectors[i].size);
+                       }
+                       
+                       retval = target->type->read_memory(target, bank->base + bank->sectors[i].offset + j, 4, chunk/4, buffer);
+                       if (retval != ERROR_OK)
+                               return retval;
+               
+                       for (nBytes = 0; nBytes < chunk; nBytes++)
+                       {
+                               if (buffer[nBytes] != 0xFF)
+                               {
+                                       bank->sectors[i].is_erased = 0;
+                                       break;
+                               }
+                       }
+               }
+       }
        
        return ERROR_OK;
+}
 
+int default_flash_blank_check(struct flash_bank_s *bank)
+{
+       target_t *target = bank->target;
+       int i;
+       int retval;
+       int fast_check = 0;
+       int blank;
+       
+       if (bank->target->state != TARGET_HALTED)
+       {
+               return ERROR_TARGET_NOT_HALTED;
+       }
+               
+       for (i = 0; i < bank->num_sectors; i++)
+       {
+               u32 address = bank->base + bank->sectors[i].offset;
+               u32 size = bank->sectors[i].size;
+               
+               if ((retval = target_blank_check_memory(target, address, size, &blank)) != ERROR_OK)
+               {
+                       fast_check = 0;
+                       break;
+               }
+               if (blank == 0xFF)
+                       bank->sectors[i].is_erased = 1;
+               else
+                       bank->sectors[i].is_erased = 0;
+               fast_check = 1;
+       }
+               
+       if (!fast_check)
+       {
+               LOG_USER("Running slow fallback erase check - add working memory");
+               return default_flash_mem_blank_check(bank);
+       }
+       
+       return ERROR_OK;
 }