X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=3d450ac8dc0306dbd472cbc1959cbdfcec72b370;hp=01bc6e70b3a340bf53ee6db5a8b0b559751fc634;hb=bdb5fd8c98ad474bf2ad790eefc62a830b33f0d4;hpb=8a14a72f573065fc38ed2e4029d2a41d701c3622 diff --git a/src/flash/flash.c b/src/flash/flash.c index 01bc6e70b3..3d450ac8dc 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -2,6 +2,12 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2007,2008 Øyvind Harboe * + * oyvind.harboe@zylin.com * + * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -41,10 +47,6 @@ #include #include -#include "jim.h" -extern Jim_Interp *interp; - - /* command handlers */ int handle_flash_bank_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); @@ -67,6 +69,7 @@ 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 aduc702x_flash; extern flash_driver_t stellaris_flash; extern flash_driver_t str9xpec_flash; extern flash_driver_t stm32x_flash; @@ -82,6 +85,7 @@ flash_driver_t *flash_drivers[] = &at91sam7_flash, &str7x_flash, &str9x_flash, + &aduc702x_flash, &stellaris_flash, &str9xpec_flash, &stm32x_flash, @@ -143,14 +147,14 @@ int flash_register_commands(struct command_context_s *cmd_ctx) return ERROR_OK; } -static int Jim_Command_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const *argv) +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; } - flash_bank_t *p; - int i = 0; if (!flash_banks) { @@ -161,7 +165,6 @@ static int Jim_Command_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const 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)); @@ -173,8 +176,8 @@ static int Jim_Command_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const 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_ListAppendElement(interp, list, elem); } Jim_SetResult(interp, list); @@ -182,13 +185,12 @@ static int Jim_Command_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const return JIM_OK; } - int flash_init_drivers(struct command_context_s *cmd_ctx) { if (flash_banks) { - Jim_CreateCommand(interp, "openocd_flash_banks", Jim_Command_flash_banks, NULL, NULL ); - + 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 "); register_command(cmd_ctx, flash_cmd, "probe", handle_flash_probe_command, COMMAND_EXEC, @@ -236,7 +238,7 @@ flash_bank_t *get_flash_bank_by_num_noprobe(int num) return NULL; } -int flash_get_bank_count() +int flash_get_bank_count(void) { flash_bank_t *p; int i = 0; @@ -267,6 +269,7 @@ flash_bank_t *get_flash_bank_by_num(int num) int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { + int retval; int i; int found = 0; target_t *target; @@ -279,7 +282,7 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char if ((target = get_target_by_num(strtoul(args[5], NULL, 0))) == NULL) { LOG_ERROR("target %lu not defined", strtoul(args[5], NULL, 0)); - return ERROR_OK; + return ERROR_FAIL; } for (i = 0; flash_drivers[i]; i++) @@ -292,7 +295,7 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char if (flash_drivers[i]->register_commands(cmd_ctx) != ERROR_OK) { LOG_ERROR("couldn't register '%s' commands", args[0]); - exit(-1); + return ERROR_FAIL; } c = malloc(sizeof(flash_bank_t)); @@ -307,11 +310,11 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char c->sectors = NULL; c->next = NULL; - if (flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c) != ERROR_OK) + if ((retval=flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c)) != ERROR_OK) { LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8x", args[0], c->base); free(c); - return ERROR_OK; + return retval; } /* put flash bank in linked list */ @@ -335,7 +338,7 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char if (!found) { LOG_ERROR("flash driver '%s' not found", args[0]); - exit(-1); + return ERROR_FAIL; } return ERROR_OK; @@ -451,7 +454,7 @@ 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; @@ -467,7 +470,7 @@ int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cm j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10, erase_state); } - + } return ERROR_OK; @@ -641,10 +644,10 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm { 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; @@ -652,13 +655,13 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm argc--; command_print(cmd_ctx, "auto erase enabled"); } - + if (argc < 1) { return ERROR_COMMAND_SYNTAX_ERROR; } - + if (!target) { LOG_ERROR("no target selected"); @@ -721,16 +724,16 @@ int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char 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; @@ -749,7 +752,7 @@ int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char default: return ERROR_COMMAND_SYNTAX_ERROR; } - + chunk_count = MIN(count, (1024 / wordsize)); switch(wordsize) { @@ -772,7 +775,7 @@ int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char LOG_ERROR("BUG: can't happen"); exit(-1); } - + duration_start_measure(&duration); flash_set_dirty(); @@ -780,7 +783,7 @@ int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char 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) { @@ -798,7 +801,7 @@ int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char break; } } - + duration_stop_measure(&duration, &duration_text); if(err == ERROR_OK) @@ -907,7 +910,7 @@ flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr) return NULL; } /* check whether address belongs to this flash bank */ - if ((addr >= c->base) && (addr < c->base + c->size) && target == c->target) + if ((addr >= c->base) && (addr <= c->base + (c->size - 1)) && target == c->target) return c; } LOG_ERROR("No flash at address 0x%08x\n", addr); @@ -972,7 +975,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) u32 section_offset; flash_bank_t *c; int *padding; - + section = 0; section_offset = 0; @@ -986,10 +989,10 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) 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) { @@ -1000,7 +1003,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) 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); @@ -1038,7 +1041,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) 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 ); } @@ -1055,10 +1058,9 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) { 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; + size_read = run_size - buffer_size; + if (size_read > image->sections[section].size - section_offset) + 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) @@ -1067,11 +1069,11 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) free(padding); return retval; } - + /* see if we need to pad the section */ while (padding[section]--) - buffer[size_read++] = 0xff; - + (buffer+buffer_size)[size_read++] = 0xff; + buffer_size += size_read; section_offset += size_read; @@ -1107,9 +1109,9 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) if (written != NULL) *written += run_size; /* add run size to total written counter */ } - + free(padding); - + return retval; } @@ -1120,17 +1122,18 @@ int default_flash_mem_blank_check(struct flash_bank_s *bank) int buffer_size = sizeof(buffer); int i; int nBytes; - + if (bank->target->state != TARGET_HALTED) { + LOG_ERROR("Target not 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; @@ -1140,11 +1143,11 @@ int default_flash_mem_blank_check(struct flash_bank_s *bank) { 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) @@ -1155,7 +1158,7 @@ int default_flash_mem_blank_check(struct flash_bank_s *bank) } } } - + return ERROR_OK; } @@ -1166,17 +1169,18 @@ int default_flash_blank_check(struct flash_bank_s *bank) int retval; int fast_check = 0; int blank; - + if (bank->target->state != TARGET_HALTED) { + LOG_ERROR("Target not 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; @@ -1188,12 +1192,12 @@ int default_flash_blank_check(struct flash_bank_s *bank) 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; }