summaryrefslogtreecommitdiff
path: root/src/flash
diff options
context:
space:
mode:
authorntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-02-28 10:07:54 +0000
committerntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-02-28 10:07:54 +0000
commit9e5a6679cac36667e51f24a6bd5670396cd06ed6 (patch)
tree89166ec64f8cac5716d6f833edef71e3a958f615 /src/flash
parent76ebc78358ef94dcf5d64c8738e6dd4bb1371b2c (diff)
downloadopenocd+libswd-9e5a6679cac36667e51f24a6bd5670396cd06ed6.tar.gz
openocd+libswd-9e5a6679cac36667e51f24a6bd5670396cd06ed6.tar.bz2
openocd+libswd-9e5a6679cac36667e51f24a6bd5670396cd06ed6.tar.xz
openocd+libswd-9e5a6679cac36667e51f24a6bd5670396cd06ed6.zip
- added svn props
- fixed mixed line endings on flash.c, log.c, gdb_server.c git-svn-id: svn://svn.berlios.de/openocd/trunk@371 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/flash')
-rw-r--r--src/flash/ecos.c970
-rw-r--r--src/flash/flash.c194
2 files changed, 582 insertions, 582 deletions
diff --git a/src/flash/ecos.c b/src/flash/ecos.c
index 09ed2507..5994660c 100644
--- a/src/flash/ecos.c
+++ b/src/flash/ecos.c
@@ -1,485 +1,485 @@
-/***************************************************************************
- * Copyright (C) 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 *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- ***************************************************************************/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "replacements.h"
-
-
-#include "flash.h"
-
-#include "target.h"
-
-#include "flash.h"
-#include "target.h"
-#include "log.h"
-#include "binarybuffer.h"
-#include "../target/embeddedice.h"
-#include "types.h"
-
-
-
-int ecosflash_register_commands(struct command_context_s *cmd_ctx);
-int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
-int ecosflash_erase(struct flash_bank_s *bank, int first, int last);
-int ecosflash_protect(struct flash_bank_s *bank, int set, int first, int last);
-int ecosflash_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
-int ecosflash_probe(struct flash_bank_s *bank);
-int ecosflash_erase_check(struct flash_bank_s *bank);
-int ecosflash_protect_check(struct flash_bank_s *bank);
-int ecosflash_info(struct flash_bank_s *bank, char *buf, int buf_size);
-
-u32 ecosflash_get_flash_status(flash_bank_t *bank);
-void ecosflash_set_flash_mode(flash_bank_t *bank,int mode);
-u32 ecosflash_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout);
-int ecosflash_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
-flash_driver_t ecosflash_flash =
-{
- .name = "ecosflash",
- .register_commands = ecosflash_register_commands,
- .flash_bank_command = ecosflash_flash_bank_command,
- .erase = ecosflash_erase,
- .protect = ecosflash_protect,
- .write = ecosflash_write,
- .probe = ecosflash_probe,
- .auto_probe = ecosflash_probe,
- .erase_check = ecosflash_erase_check,
- .protect_check = ecosflash_protect_check,
- .info = ecosflash_info
-};
-
-typedef struct ecosflash_flash_bank_s
-{
- struct target_s *target;
- working_area_t *write_algorithm;
- working_area_t *erase_check_algorithm;
- char *driverPath;
- u32 start_address;
-} ecosflash_flash_bank_t;
-
-static const int sectorSize=0x10000;
-
-char *
-flash_errmsg(int err);
-
-#ifndef __ECOS
-#define FLASH_ERR_OK 0x00 // No error - operation complete
-#define FLASH_ERR_INVALID 0x01 // Invalid FLASH address
-#define FLASH_ERR_ERASE 0x02 // Error trying to erase
-#define FLASH_ERR_LOCK 0x03 // Error trying to lock/unlock
-#define FLASH_ERR_PROGRAM 0x04 // Error trying to program
-#define FLASH_ERR_PROTOCOL 0x05 // Generic error
-#define FLASH_ERR_PROTECT 0x06 // Device/region is write-protected
-#define FLASH_ERR_NOT_INIT 0x07 // FLASH info not yet initialized
-#define FLASH_ERR_HWR 0x08 // Hardware (configuration?) problem
-#define FLASH_ERR_ERASE_SUSPEND 0x09 // Device is in erase suspend mode
-#define FLASH_ERR_PROGRAM_SUSPEND 0x0a // Device is in in program suspend mode
-#define FLASH_ERR_DRV_VERIFY 0x0b // Driver failed to verify data
-#define FLASH_ERR_DRV_TIMEOUT 0x0c // Driver timed out waiting for device
-#define FLASH_ERR_DRV_WRONG_PART 0x0d // Driver does not support device
-#define FLASH_ERR_LOW_VOLTAGE 0x0e // Not enough juice to complete job
-
-
-char *
-flash_errmsg(int err)
-{
- switch (err) {
- case FLASH_ERR_OK:
- return "No error - operation complete";
- case FLASH_ERR_ERASE_SUSPEND:
- return "Device is in erase suspend state";
- case FLASH_ERR_PROGRAM_SUSPEND:
- return "Device is in program suspend state";
- case FLASH_ERR_INVALID:
- return "Invalid FLASH address";
- case FLASH_ERR_ERASE:
- return "Error trying to erase";
- case FLASH_ERR_LOCK:
- return "Error trying to lock/unlock";
- case FLASH_ERR_PROGRAM:
- return "Error trying to program";
- case FLASH_ERR_PROTOCOL:
- return "Generic error";
- case FLASH_ERR_PROTECT:
- return "Device/region is write-protected";
- case FLASH_ERR_NOT_INIT:
- return "FLASH sub-system not initialized";
- case FLASH_ERR_DRV_VERIFY:
- return "Data verify failed after operation";
- case FLASH_ERR_DRV_TIMEOUT:
- return "Driver timed out waiting for device";
- case FLASH_ERR_DRV_WRONG_PART:
- return "Driver does not support device";
- case FLASH_ERR_LOW_VOLTAGE:
- return "Device reports low voltage";
- default:
- return "Unknown error";
- }
-}
-#endif
-
-/* flash bank ecosflash <base> <size> <chip_width> <bus_width> <target#> <driverPath>
- */
-int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
-{
- ecosflash_flash_bank_t *info;
-
- if (argc < 7)
- {
- WARNING("incomplete flash_bank ecosflash configuration");
- return ERROR_FLASH_BANK_INVALID;
- }
-
- info = malloc(sizeof(ecosflash_flash_bank_t));
- if(info == NULL)
- {
- ERROR("no memory for flash bank info");
- exit(-1);
- }
- bank->driver_priv = info;
- info->driverPath=strdup(args[6]);
-
- // eCos flash sector sizes are not exposed to OpenOCD, use 0x10000 as
- // a way to improve impeadance matach between OpenOCD and eCos flash
- // driver
- int i = 0;
- u32 offset = 0;
- bank->num_sectors=bank->size/sectorSize;
- bank->sectors = malloc(sizeof(flash_sector_t) * bank->num_sectors);
- for (i = 0; i < bank->num_sectors; i++)
- {
- bank->sectors[i].offset = offset;
- bank->sectors[i].size = sectorSize;
- offset += bank->sectors[i].size;
- bank->sectors[i].is_erased = -1;
- bank->sectors[i].is_protected = 0;
- }
-
- info->target = get_target_by_num(strtoul(args[5], NULL, 0));
- if (info->target == NULL)
- {
- ERROR("no target '%i' configured", (int)strtoul(args[5], NULL, 0));
- exit(-1);
- }
- return ERROR_OK;
-}
-
-
-int loadDriver(ecosflash_flash_bank_t *info)
-{
- u32 buf_cnt;
- u32 image_size;
- image_t image;
-
- image.base_address_set = 0;
- image.start_address_set = 0;
- target_t *target=info->target;
-
- if (image_open(&image, info->driverPath, NULL) != ERROR_OK)
- {
- ERROR("load_image error: %s", image.error_str);
- return ERROR_FLASH_BANK_INVALID;
- }
-
- info->start_address=image.start_address;
-
- image_size = 0x0;
- int i;
- for (i = 0; i < image.num_sections; i++)
- {
- void *buffer = malloc(image.sections[i].size);
- int retval;
- if ((retval = image_read_section(&image, i, 0x0, image.sections[i].size, buffer, &buf_cnt)) != ERROR_OK)
- {
- ERROR("image_read_section failed with error code: %i", retval);
- free(buffer);
- image_close(&image);
- return ERROR_FLASH_BANK_INVALID;
- }
- target_write_buffer(target, image.sections[i].base_address, buf_cnt, buffer);
- image_size += buf_cnt;
- DEBUG("%u byte written at address 0x%8.8x", buf_cnt, image.sections[i].base_address);
-
- free(buffer);
- }
-
- image_close(&image);
-
- return ERROR_OK;
-}
-
-
-static int const OFFSET_ERASE=0x0;
-static int const OFFSET_ERASE_SIZE=0x8;
-static int const OFFSET_FLASH=0xc;
-static int const OFFSET_FLASH_SIZE=0x8;
-static int const OFFSET_GET_WORKAREA=0x18;
-static int const OFFSET_GET_WORKAREA_SIZE=0x4;
-
-
-int runCode(ecosflash_flash_bank_t *info,
- u32 codeStart, u32 codeStop, u32 r0, u32 r1, u32 r2,
- u32 *result,
- // timeout in ms
- int timeout)
-{
- target_t *target=info->target;
-
- reg_param_t reg_params[3];
- armv4_5_algorithm_t armv4_5_info;
- armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
- armv4_5_info.core_mode = ARMV4_5_MODE_SVC;
- armv4_5_info.core_state = ARMV4_5_STATE_ARM;
-
- init_reg_param(&reg_params[0], "r0", 32, PARAM_IN_OUT);
- init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);
- init_reg_param(&reg_params[2], "r2", 32, PARAM_OUT);
-
- buf_set_u32(reg_params[0].value, 0, 32, r0);
- buf_set_u32(reg_params[1].value, 0, 32, r1);
- buf_set_u32(reg_params[2].value, 0, 32, r2);
-
- int retval;
- if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params,
- codeStart,
- codeStop, timeout,
- &armv4_5_info)) != ERROR_OK)
- {
- ERROR("error executing eCos flash algorithm");
- return retval;
- }
-
- *result=buf_get_u32(reg_params[0].value, 0, 32);
-
- destroy_reg_param(&reg_params[0]);
- destroy_reg_param(&reg_params[1]);
- destroy_reg_param(&reg_params[2]);
-
- return ERROR_OK;
-}
-
-int eCosBoard_erase(ecosflash_flash_bank_t *info, u32 address, u32 len)
-{
- int retval;
- int timeout = (len / 20480 + 1) * 1000; /*asume 20 KB/s*/
-
- retval=loadDriver(info);
- if (retval!=ERROR_OK)
- return retval;
-
- u32 flashErr;
- retval=runCode(info,
- info->start_address+OFFSET_ERASE,
- info->start_address+OFFSET_ERASE+OFFSET_ERASE_SIZE,
- address,
- len,
- 0,
- &flashErr,
- timeout
- );
- if (retval!=ERROR_OK)
- return retval;
-
- if (flashErr != 0x0)
- {
- ERROR("Flash erase failed with %d (%s)\n", flashErr, flash_errmsg(flashErr));
- return ERROR_JTAG_DEVICE_ERROR;
- }
-
- return ERROR_OK;
-}
-
-int eCosBoard_flash(ecosflash_flash_bank_t *info, void *data, u32 address, u32 len)
-{
- target_t *target=info->target;
- const int chunk=8192;
- int retval=ERROR_OK;
- int timeout = (chunk / 20480 + 1) * 1000; /*asume 20 KB/s + 1 second*/
-
- retval=loadDriver(info);
- if (retval!=ERROR_OK)
- return retval;
-
- u32 buffer;
- retval=runCode(info,
- info->start_address+OFFSET_GET_WORKAREA,
- info->start_address+OFFSET_GET_WORKAREA+OFFSET_GET_WORKAREA_SIZE,
- 0,
- 0,
- 0,
- &buffer,
- 1000);
- if (retval!=ERROR_OK)
- return retval;
-
-
- int i;
- for (i=0; i<len; i+=chunk)
- {
- int t=len-i;
- if (t>chunk)
- {
- t=chunk;
- }
-
- int retval;
- retval=target_write_buffer(target, buffer, t, ((char *)data)+i);
- if (retval != ERROR_OK)
- return retval;
-
- u32 flashErr;
- retval=runCode(info,
- info->start_address+OFFSET_FLASH,
- info->start_address+OFFSET_FLASH+OFFSET_FLASH_SIZE,
- buffer,
- address+i,
- t,
- &flashErr,
- timeout);
- if (retval != ERROR_OK)
- return retval;
-
- if (flashErr != 0x0)
- {
- ERROR("Flash prog failed with %d (%s)\n", flashErr, flash_errmsg(flashErr));
- return ERROR_JTAG_DEVICE_ERROR;
- }
- }
- return ERROR_OK;
-}
-
-
-int ecosflash_probe(struct flash_bank_s *bank)
-{
- return ERROR_OK;
-}
-
-
-int ecosflash_register_commands(struct command_context_s *cmd_ctx)
-{
- register_command(cmd_ctx, NULL, "ecosflash", NULL, COMMAND_ANY, NULL);
-
- return ERROR_OK;
-}
-
-/*
-static void command(flash_bank_t *bank, u8 cmd, u8 *cmd_buf)
-{
- ecosflash_flash_bank_t *info = bank->driver_priv;
- int i;
-
- if (info->target->endianness == TARGET_LITTLE_ENDIAN)
- {
- for (i = bank->bus_width; i > 0; i--)
- {
- *cmd_buf++ = (i & (bank->chip_width - 1)) ? 0x0 : cmd;
- }
- }
- else
- {
- for (i = 1; i <= bank->bus_width; i++)
- {
- *cmd_buf++ = (i & (bank->chip_width - 1)) ? 0x0 : cmd;
- }
- }
-}
-*/
-
-u32 ecosflash_address(struct flash_bank_s *bank, u32 address)
-{
- u32 retval = 0;
- switch(bank->bus_width)
- {
- case 4:
- retval = address & 0xfffffffc;
- case 2:
- retval = address & 0xfffffffe;
- case 1:
- retval = address;
- }
-
- return retval + bank->base;
-}
-
-
-int ecosflash_erase(struct flash_bank_s *bank, int first, int last)
-{
- struct flash_bank_s *c=bank;
- ecosflash_flash_bank_t *info = bank->driver_priv;
- return eCosBoard_erase(info, c->base+first*sectorSize, sectorSize*(last-first+1));
-}
-
-int ecosflash_protect(struct flash_bank_s *bank, int set, int first, int last)
-{
- return ERROR_OK;
-}
-
-
-int ecosflash_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
-{
- ecosflash_flash_bank_t *info = bank->driver_priv;
- struct flash_bank_s *c=bank;
- return eCosBoard_flash(info, buffer, c->base+offset, count);
-}
-
-
-int ecosflash_erase_check(struct flash_bank_s *bank)
-{
- return ERROR_OK;
-}
-
-int ecosflash_protect_check(struct flash_bank_s *bank)
-{
- return ERROR_OK;
-}
-
-int ecosflash_info(struct flash_bank_s *bank, char *buf, int buf_size)
-{
- ecosflash_flash_bank_t *info = bank->driver_priv;
- snprintf(buf, buf_size, "eCos flash driver: %s", info->driverPath);
- return ERROR_OK;
-}
-
-
-u32 ecosflash_get_flash_status(flash_bank_t *bank)
-{
- return ERROR_OK;
-}
-
-void ecosflash_set_flash_mode(flash_bank_t *bank,int mode)
-{
-
-}
-
-u32 ecosflash_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout)
-{
- return ERROR_OK;
-}
-
-int ecosflash_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
- return ERROR_OK;
-}
-
-
-
-
+/***************************************************************************
+ * Copyright (C) 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 *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "replacements.h"
+
+
+#include "flash.h"
+
+#include "target.h"
+
+#include "flash.h"
+#include "target.h"
+#include "log.h"
+#include "binarybuffer.h"
+#include "../target/embeddedice.h"
+#include "types.h"
+
+
+
+int ecosflash_register_commands(struct command_context_s *cmd_ctx);
+int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
+int ecosflash_erase(struct flash_bank_s *bank, int first, int last);
+int ecosflash_protect(struct flash_bank_s *bank, int set, int first, int last);
+int ecosflash_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
+int ecosflash_probe(struct flash_bank_s *bank);
+int ecosflash_erase_check(struct flash_bank_s *bank);
+int ecosflash_protect_check(struct flash_bank_s *bank);
+int ecosflash_info(struct flash_bank_s *bank, char *buf, int buf_size);
+
+u32 ecosflash_get_flash_status(flash_bank_t *bank);
+void ecosflash_set_flash_mode(flash_bank_t *bank,int mode);
+u32 ecosflash_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout);
+int ecosflash_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+
+flash_driver_t ecosflash_flash =
+{
+ .name = "ecosflash",
+ .register_commands = ecosflash_register_commands,
+ .flash_bank_command = ecosflash_flash_bank_command,
+ .erase = ecosflash_erase,
+ .protect = ecosflash_protect,
+ .write = ecosflash_write,
+ .probe = ecosflash_probe,
+ .auto_probe = ecosflash_probe,
+ .erase_check = ecosflash_erase_check,
+ .protect_check = ecosflash_protect_check,
+ .info = ecosflash_info
+};
+
+typedef struct ecosflash_flash_bank_s
+{
+ struct target_s *target;
+ working_area_t *write_algorithm;
+ working_area_t *erase_check_algorithm;
+ char *driverPath;
+ u32 start_address;
+} ecosflash_flash_bank_t;
+
+static const int sectorSize=0x10000;
+
+char *
+flash_errmsg(int err);
+
+#ifndef __ECOS
+#define FLASH_ERR_OK 0x00 // No error - operation complete
+#define FLASH_ERR_INVALID 0x01 // Invalid FLASH address
+#define FLASH_ERR_ERASE 0x02 // Error trying to erase
+#define FLASH_ERR_LOCK 0x03 // Error trying to lock/unlock
+#define FLASH_ERR_PROGRAM 0x04 // Error trying to program
+#define FLASH_ERR_PROTOCOL 0x05 // Generic error
+#define FLASH_ERR_PROTECT 0x06 // Device/region is write-protected
+#define FLASH_ERR_NOT_INIT 0x07 // FLASH info not yet initialized
+#define FLASH_ERR_HWR 0x08 // Hardware (configuration?) problem
+#define FLASH_ERR_ERASE_SUSPEND 0x09 // Device is in erase suspend mode
+#define FLASH_ERR_PROGRAM_SUSPEND 0x0a // Device is in in program suspend mode
+#define FLASH_ERR_DRV_VERIFY 0x0b // Driver failed to verify data
+#define FLASH_ERR_DRV_TIMEOUT 0x0c // Driver timed out waiting for device
+#define FLASH_ERR_DRV_WRONG_PART 0x0d // Driver does not support device
+#define FLASH_ERR_LOW_VOLTAGE 0x0e // Not enough juice to complete job
+
+
+char *
+flash_errmsg(int err)
+{
+ switch (err) {
+ case FLASH_ERR_OK:
+ return "No error - operation complete";
+ case FLASH_ERR_ERASE_SUSPEND:
+ return "Device is in erase suspend state";
+ case FLASH_ERR_PROGRAM_SUSPEND:
+ return "Device is in program suspend state";
+ case FLASH_ERR_INVALID:
+ return "Invalid FLASH address";
+ case FLASH_ERR_ERASE:
+ return "Error trying to erase";
+ case FLASH_ERR_LOCK:
+ return "Error trying to lock/unlock";
+ case FLASH_ERR_PROGRAM:
+ return "Error trying to program";
+ case FLASH_ERR_PROTOCOL:
+ return "Generic error";
+ case FLASH_ERR_PROTECT:
+ return "Device/region is write-protected";
+ case FLASH_ERR_NOT_INIT:
+ return "FLASH sub-system not initialized";
+ case FLASH_ERR_DRV_VERIFY:
+ return "Data verify failed after operation";
+ case FLASH_ERR_DRV_TIMEOUT:
+ return "Driver timed out waiting for device";
+ case FLASH_ERR_DRV_WRONG_PART:
+ return "Driver does not support device";
+ case FLASH_ERR_LOW_VOLTAGE:
+ return "Device reports low voltage";
+ default:
+ return "Unknown error";
+ }
+}
+#endif
+
+/* flash bank ecosflash <base> <size> <chip_width> <bus_width> <target#> <driverPath>
+ */
+int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+{
+ ecosflash_flash_bank_t *info;
+
+ if (argc < 7)
+ {
+ WARNING("incomplete flash_bank ecosflash configuration");
+ return ERROR_FLASH_BANK_INVALID;
+ }
+
+ info = malloc(sizeof(ecosflash_flash_bank_t));
+ if(info == NULL)
+ {
+ ERROR("no memory for flash bank info");
+ exit(-1);
+ }
+ bank->driver_priv = info;
+ info->driverPath=strdup(args[6]);
+
+ // eCos flash sector sizes are not exposed to OpenOCD, use 0x10000 as
+ // a way to improve impeadance matach between OpenOCD and eCos flash
+ // driver
+ int i = 0;
+ u32 offset = 0;
+ bank->num_sectors=bank->size/sectorSize;
+ bank->sectors = malloc(sizeof(flash_sector_t) * bank->num_sectors);
+ for (i = 0; i < bank->num_sectors; i++)
+ {
+ bank->sectors[i].offset = offset;
+ bank->sectors[i].size = sectorSize;
+ offset += bank->sectors[i].size;
+ bank->sectors[i].is_erased = -1;
+ bank->sectors[i].is_protected = 0;
+ }
+
+ info->target = get_target_by_num(strtoul(args[5], NULL, 0));
+ if (info->target == NULL)
+ {
+ ERROR("no target '%i' configured", (int)strtoul(args[5], NULL, 0));
+ exit(-1);
+ }
+ return ERROR_OK;
+}
+
+
+int loadDriver(ecosflash_flash_bank_t *info)
+{
+ u32 buf_cnt;
+ u32 image_size;
+ image_t image;
+
+ image.base_address_set = 0;
+ image.start_address_set = 0;
+ target_t *target=info->target;
+
+ if (image_open(&image, info->driverPath, NULL) != ERROR_OK)
+ {
+ ERROR("load_image error: %s", image.error_str);
+ return ERROR_FLASH_BANK_INVALID;
+ }
+
+ info->start_address=image.start_address;
+
+ image_size = 0x0;
+ int i;
+ for (i = 0; i < image.num_sections; i++)
+ {
+ void *buffer = malloc(image.sections[i].size);
+ int retval;
+ if ((retval = image_read_section(&image, i, 0x0, image.sections[i].size, buffer, &buf_cnt)) != ERROR_OK)
+ {
+ ERROR("image_read_section failed with error code: %i", retval);
+ free(buffer);
+ image_close(&image);
+ return ERROR_FLASH_BANK_INVALID;
+ }
+ target_write_buffer(target, image.sections[i].base_address, buf_cnt, buffer);
+ image_size += buf_cnt;
+ DEBUG("%u byte written at address 0x%8.8x", buf_cnt, image.sections[i].base_address);
+
+ free(buffer);
+ }
+
+ image_close(&image);
+
+ return ERROR_OK;
+}
+
+
+static int const OFFSET_ERASE=0x0;
+static int const OFFSET_ERASE_SIZE=0x8;
+static int const OFFSET_FLASH=0xc;
+static int const OFFSET_FLASH_SIZE=0x8;
+static int const OFFSET_GET_WORKAREA=0x18;
+static int const OFFSET_GET_WORKAREA_SIZE=0x4;
+
+
+int runCode(ecosflash_flash_bank_t *info,
+ u32 codeStart, u32 codeStop, u32 r0, u32 r1, u32 r2,
+ u32 *result,
+ // timeout in ms
+ int timeout)
+{
+ target_t *target=info->target;
+
+ reg_param_t reg_params[3];
+ armv4_5_algorithm_t armv4_5_info;
+ armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
+ armv4_5_info.core_mode = ARMV4_5_MODE_SVC;
+ armv4_5_info.core_state = ARMV4_5_STATE_ARM;
+
+ init_reg_param(&reg_params[0], "r0", 32, PARAM_IN_OUT);
+ init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);
+ init_reg_param(&reg_params[2], "r2", 32, PARAM_OUT);
+
+ buf_set_u32(reg_params[0].value, 0, 32, r0);
+ buf_set_u32(reg_params[1].value, 0, 32, r1);
+ buf_set_u32(reg_params[2].value, 0, 32, r2);
+
+ int retval;
+ if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params,
+ codeStart,
+ codeStop, timeout,
+ &armv4_5_info)) != ERROR_OK)
+ {
+ ERROR("error executing eCos flash algorithm");
+ return retval;
+ }
+
+ *result=buf_get_u32(reg_params[0].value, 0, 32);
+
+ destroy_reg_param(&reg_params[0]);
+ destroy_reg_param(&reg_params[1]);
+ destroy_reg_param(&reg_params[2]);
+
+ return ERROR_OK;
+}
+
+int eCosBoard_erase(ecosflash_flash_bank_t *info, u32 address, u32 len)
+{
+ int retval;
+ int timeout = (len / 20480 + 1) * 1000; /*asume 20 KB/s*/
+
+ retval=loadDriver(info);
+ if (retval!=ERROR_OK)
+ return retval;
+
+ u32 flashErr;
+ retval=runCode(info,
+ info->start_address+OFFSET_ERASE,
+ info->start_address+OFFSET_ERASE+OFFSET_ERASE_SIZE,
+ address,
+ len,
+ 0,
+ &flashErr,
+ timeout
+ );
+ if (retval!=ERROR_OK)
+ return retval;
+
+ if (flashErr != 0x0)
+ {
+ ERROR("Flash erase failed with %d (%s)\n", flashErr, flash_errmsg(flashErr));
+ return ERROR_JTAG_DEVICE_ERROR;
+ }
+
+ return ERROR_OK;
+}
+
+int eCosBoard_flash(ecosflash_flash_bank_t *info, void *data, u32 address, u32 len)
+{
+ target_t *target=info->target;
+ const int chunk=8192;
+ int retval=ERROR_OK;
+ int timeout = (chunk / 20480 + 1) * 1000; /*asume 20 KB/s + 1 second*/
+
+ retval=loadDriver(info);
+ if (retval!=ERROR_OK)
+ return retval;
+
+ u32 buffer;
+ retval=runCode(info,
+ info->start_address+OFFSET_GET_WORKAREA,
+ info->start_address+OFFSET_GET_WORKAREA+OFFSET_GET_WORKAREA_SIZE,
+ 0,
+ 0,
+ 0,
+ &buffer,
+ 1000);
+ if (retval!=ERROR_OK)
+ return retval;
+
+
+ int i;
+ for (i=0; i<len; i+=chunk)
+ {
+ int t=len-i;
+ if (t>chunk)
+ {
+ t=chunk;
+ }
+
+ int retval;
+ retval=target_write_buffer(target, buffer, t, ((char *)data)+i);
+ if (retval != ERROR_OK)
+ return retval;
+
+ u32 flashErr;
+ retval=runCode(info,
+ info->start_address+OFFSET_FLASH,
+ info->start_address+OFFSET_FLASH+OFFSET_FLASH_SIZE,
+ buffer,
+ address+i,
+ t,
+ &flashErr,
+ timeout);
+ if (retval != ERROR_OK)
+ return retval;
+
+ if (flashErr != 0x0)
+ {
+ ERROR("Flash prog failed with %d (%s)\n", flashErr, flash_errmsg(flashErr));
+ return ERROR_JTAG_DEVICE_ERROR;
+ }
+ }
+ return ERROR_OK;
+}
+
+
+int ecosflash_probe(struct flash_bank_s *bank)
+{
+ return ERROR_OK;
+}
+
+
+int ecosflash_register_commands(struct command_context_s *cmd_ctx)
+{
+ register_command(cmd_ctx, NULL, "ecosflash", NULL, COMMAND_ANY, NULL);
+
+ return ERROR_OK;
+}
+
+/*
+static void command(flash_bank_t *bank, u8 cmd, u8 *cmd_buf)
+{
+ ecosflash_flash_bank_t *info = bank->driver_priv;
+ int i;
+
+ if (info->target->endianness == TARGET_LITTLE_ENDIAN)
+ {
+ for (i = bank->bus_width; i > 0; i--)
+ {
+ *cmd_buf++ = (i & (bank->chip_width - 1)) ? 0x0 : cmd;
+ }
+ }
+ else
+ {
+ for (i = 1; i <= bank->bus_width; i++)
+ {
+ *cmd_buf++ = (i & (bank->chip_width - 1)) ? 0x0 : cmd;
+ }
+ }
+}
+*/
+
+u32 ecosflash_address(struct flash_bank_s *bank, u32 address)
+{
+ u32 retval = 0;
+ switch(bank->bus_width)
+ {
+ case 4:
+ retval = address & 0xfffffffc;
+ case 2:
+ retval = address & 0xfffffffe;
+ case 1:
+ retval = address;
+ }
+
+ return retval + bank->base;
+}
+
+
+int ecosflash_erase(struct flash_bank_s *bank, int first, int last)
+{
+ struct flash_bank_s *c=bank;
+ ecosflash_flash_bank_t *info = bank->driver_priv;
+ return eCosBoard_erase(info, c->base+first*sectorSize, sectorSize*(last-first+1));
+}
+
+int ecosflash_protect(struct flash_bank_s *bank, int set, int first, int last)
+{
+ return ERROR_OK;
+}
+
+
+int ecosflash_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
+{
+ ecosflash_flash_bank_t *info = bank->driver_priv;
+ struct flash_bank_s *c=bank;
+ return eCosBoard_flash(info, buffer, c->base+offset, count);
+}
+
+
+int ecosflash_erase_check(struct flash_bank_s *bank)
+{
+ return ERROR_OK;
+}
+
+int ecosflash_protect_check(struct flash_bank_s *bank)
+{
+ return ERROR_OK;
+}
+
+int ecosflash_info(struct flash_bank_s *bank, char *buf, int buf_size)
+{
+ ecosflash_flash_bank_t *info = bank->driver_priv;
+ snprintf(buf, buf_size, "eCos flash driver: %s", info->driverPath);
+ return ERROR_OK;
+}
+
+
+u32 ecosflash_get_flash_status(flash_bank_t *bank)
+{
+ return ERROR_OK;
+}
+
+void ecosflash_set_flash_mode(flash_bank_t *bank,int mode)
+{
+
+}
+
+u32 ecosflash_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout)
+{
+ return ERROR_OK;
+}
+
+int ecosflash_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+ return ERROR_OK;
+}
+
+
+
+
diff --git a/src/flash/flash.c b/src/flash/flash.c
index f1710851..9bc0520d 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -64,7 +64,7 @@ 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 ecosflash_flash;
flash_driver_t *flash_drivers[] =
{
@@ -77,7 +77,7 @@ flash_driver_t *flash_drivers[] =
&str9xpec_flash,
&stm32x_flash,
&tms470_flash,
- &ecosflash_flash,
+ &ecosflash_flash,
NULL,
};
@@ -115,7 +115,7 @@ static int flash_driver_erase(struct flash_bank_s *bank, int first, int last)
{
ERROR("invalid flash sector");
retval=ERROR_FLASH_SECTOR_INVALID;
- } else
+ } else
{
retval=bank->driver->erase(bank, first, last);
}
@@ -137,7 +137,7 @@ int flash_driver_protect(struct flash_bank_s *bank, int set, int first, int last
{
ERROR("invalid flash sector");
retval=ERROR_FLASH_SECTOR_INVALID;
- } else
+ } else
{
retval=bank->driver->protect(bank, set, first, last);
}
@@ -152,7 +152,7 @@ int flash_driver_protect(struct flash_bank_s *bank, int set, int first, int last
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, "flash_bank <driver> <base> <size> <chip_width> <bus_width> <target> [driver_options ...]");
register_command(cmd_ctx, flash_cmd, "auto_erase", handle_flash_auto_erase_command, COMMAND_ANY,
"auto erase flash sectors <on|off>");
@@ -184,7 +184,7 @@ int flash_init_drivers(struct command_context_s *cmd_ctx)
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;
}
@@ -208,12 +208,12 @@ 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)
{
ERROR("auto_probe failed %d\n", retval);
@@ -227,31 +227,31 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char
int i;
int found = 0;
target_t *target;
-
+
if (argc < 6)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
-
+
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];
@@ -263,14 +263,14 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char
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)
{
@@ -283,18 +283,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]);
exit(-1);
}
-
+
return ERROR_OK;
}
@@ -302,19 +302,19 @@ int handle_flash_banks_command(struct command_context_s *cmd_ctx, char *cmd, cha
{
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;
}
@@ -323,34 +323,34 @@ int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char
flash_bank_t *p;
int i = 0;
int j = 0;
-
+
if (argc != 1)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
-
+
for (p = flash_banks; p; p = p->next, i++)
{
if (i == strtoul(args[0], NULL, 0))
{
char buf[1024];
-
+
/* attempt auto probe */
p->driver->auto_probe(p);
-
+
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)
@@ -362,12 +362,12 @@ int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char
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;
}
@@ -375,12 +375,12 @@ int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, cha
{
flash_bank_t *p;
int retval;
-
+
if (argc != 1)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
-
+
p = get_flash_bank_by_num_noprobe(strtoul(args[0], NULL, 0));
if (p)
{
@@ -403,7 +403,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;
}
@@ -411,12 +411,12 @@ int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cm
{
flash_bank_t *p;
int retval;
-
+
if (argc != 1)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
-
+
p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
if (p)
{
@@ -430,7 +430,7 @@ int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cm
args[0], p->base);
}
}
-
+
return ERROR_OK;
}
@@ -442,14 +442,14 @@ int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *
int length;
duration_t duration;
char *duration_text;
-
+
target_t *target = get_current_target(cmd_ctx);
if (argc != 2)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
-
+
address = strtoul(args[0], NULL, 0);
length = strtoul(args[1], NULL, 0);
if (length <= 0)
@@ -463,19 +463,19 @@ int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
-
+
/* 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);
+ 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;
}
@@ -483,12 +483,12 @@ int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *
{
flash_bank_t *p;
int retval;
-
+
if (argc != 1)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
-
+
p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
if (p)
{
@@ -509,7 +509,7 @@ int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
-
+
return ERROR_OK;
}
@@ -523,18 +523,18 @@ int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, cha
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)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
-
+
if ((retval = flash_driver_erase(p, first, last)) == ERROR_OK)
{
- duration_stop_measure(&duration, &duration_text);
-
+ 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);
}
@@ -561,7 +561,7 @@ 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)
@@ -570,7 +570,7 @@ int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, c
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
-
+
retval = flash_driver_protect(p, set, first, last);
if (retval == ERROR_OK)
{
@@ -589,13 +589,13 @@ int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, c
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)
@@ -603,15 +603,15 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm
return ERROR_COMMAND_SYNTAX_ERROR;
}
-
+
if (!target)
{
ERROR("no target selected");
return ERROR_OK;
}
-
+
duration_start_measure(&duration);
-
+
if (argc >= 2)
{
image.base_address_set = 1;
@@ -622,7 +622,7 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm
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);
@@ -631,7 +631,7 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm
command_print(cmd_ctx, "image_open error: %s", image.error_str);
return retval;
}
-
+
retval = flash_write(target, &image, &written, auto_erase);
if (retval != ERROR_OK)
@@ -639,7 +639,7 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm
image_close(&image);
return retval;
}
-
+
duration_stop_measure(&duration, &duration_text);
if (retval == ERROR_OK)
{
@@ -650,7 +650,7 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm
free(duration_text);
image_close(&image);
-
+
return retval;
}
@@ -661,10 +661,10 @@ int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd
u32 buf_cnt;
fileio_t fileio;
-
+
duration_t duration;
char *duration_text;
-
+
int retval;
flash_bank_t *p;
@@ -672,9 +672,9 @@ int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd
{
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)
@@ -682,24 +682,24 @@ int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd
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;
}
-
+
retval = flash_driver_write(p, buffer, offset, buf_cnt);
-
+
free(buffer);
-
+
duration_stop_measure(&duration, &duration_text);
if (retval!=ERROR_OK)
{
@@ -710,7 +710,7 @@ int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd
free(duration_text);
fileio_close(&fileio);
-
+
return retval;
}
@@ -718,13 +718,13 @@ 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;
+ c->sectors[i].is_erased = 0;
}
}
}
@@ -739,7 +739,7 @@ flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr)
{
int retval;
retval = c->driver->auto_probe(c);
-
+
if (retval != ERROR_OK)
{
ERROR("auto_probe failed %d\n", retval);
@@ -760,30 +760,30 @@ int flash_erase_address_range(target_t *target, u32 addr, u32 length)
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)
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 */
@@ -792,10 +792,10 @@ int flash_erase_address_range(target_t *target, u32 addr, u32 length)
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);
}
@@ -807,21 +807,21 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase)
int section;
u32 section_offset;
flash_bank_t *c;
-
+
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();
}
-
+
/* loop until we reach end of the image */
while (section < image->num_sections)
{
@@ -876,17 +876,17 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase)
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);
-
+
return retval;
}
@@ -901,19 +901,19 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase)
}
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)
@@ -935,13 +935,13 @@ int handle_flash_auto_erase_command(struct command_context_s *cmd_ctx, char *cmd
return ERROR_COMMAND_SYNTAX_ERROR;
}
-
+
if (strcmp(args[0], "on") == 0)
auto_erase = 1;
else if (strcmp(args[0], "off") == 0)
auto_erase = 0;
- else
+ else
return ERROR_COMMAND_SYNTAX_ERROR;
-
+
return ERROR_OK;
}