* 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 *
/* 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);
return retval;
}
-
int flash_register_commands(struct command_context_s *cmd_ctx)
{
flash_cmd = register_command(cmd_ctx, NULL, "flash", NULL, COMMAND_ANY, NULL);
return ERROR_OK;
}
+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,
return NULL;
}
-int flash_get_bank_count()
+int flash_get_bank_count(void)
{
flash_bank_t *p;
int i = 0;
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;
-}
-
int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
flash_bank_t *p;
int section;
u32 section_offset;
flash_bank_t *c;
-
+ int *padding;
+
section = 0;
section_offset = 0;
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)
{
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);
/* 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))
{
LOG_DEBUG("section %d out of order(very slightly surprising, but supported)", section_last + 1);
break;
}
- if (image->sections[section_last + 1].base_address != (run_address + run_size))
+ /* 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;
+ 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 */
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 (retval != ERROR_OK)
{
+ free(padding);
return retval; /* abort operation */
}
if (written != NULL)
*written += run_size; /* add run size to total written counter */
}
-
+
+ free(padding);
+
return retval;
}
-int default_flash_blank_check(struct flash_bank_s *bank)
+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 buffer_size = sizeof(buffer);
int i;
int nBytes;
return ERROR_TARGET_NOT_HALTED;
}
- int retval;
- int fast_check=0;
- working_area_t *erase_check_algorithm;
-#if 0
- /* FIX! doesn't work yet... */
- /*
- char test(char *a, int len, char t)
+ for (i = 0; i < bank->num_sectors; i++)
{
- int i=0;
-
- for (i=0; i<len; i++)
+ int j;
+ bank->sectors[i].is_erased = 1;
+
+ for (j = 0; j < bank->sectors[i].size; j += buffer_size)
{
- t&=a[i];
-
+ 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;
+ }
+ }
}
}
- $ arm-elf-gcc -c -mthumb -O3 test.c
-
- $ arm-elf-objdump --disassemble test.o
-
- test.o: file format elf32-littlearm
-
- Disassembly of section .text:
-
- 00000000 <test>:
- 0: b510 push {r4, lr}
- 2: 0612 lsl r2, r2, #24
- 4: 1c04 mov r4, r0 (add r4, r0, #0)
- 6: 0e10 lsr r0, r2, #24
- 8: 2200 mov r2, #0
- a: 2900 cmp r1, #0
- c: dd04 ble 18 <test+0x18>
- e: 5ca3 ldrb r3, [r4, r2]
- 10: 3201 add r2, #1
- 12: 4018 and r0, r3
- 14: 428a cmp r2, r1
- 16: dbfa blt e <test+0xe>
- 18: bd10 pop {r4, pc}
- 1a: 46c0 nop (mov r8, r8)
-
-
- */
- u16 erase_check_code[] =
- {
- 0x0612,// lsl r2, r2, #24
- 0x1c04,// mov r4, r0 (add r4, r0, #0)
- 0x0e10,// lsr r0, r2, #24
- 0x2200,// mov r2, #0
- 0x2900,// cmp r1, #0
- 0xdd04,// ble 18 <test+0x18>
- 0x5ca3,// ldrb r3, [r4, r2]
- 0x3201,// add r2, #1
- 0x4018,// and r0, r3
- 0x428a,// cmp r2, r1
- 0xdbfa,// blt e <test+0xe>
- 0x46c0,// nop (mov r8, r8)
-
- };
-
+ 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;
- /* make sure we have a working area */
- if (target_alloc_working_area(target, ((sizeof(erase_check_code)+3)/4)*4, &erase_check_algorithm) != ERROR_OK)
+ if (bank->target->state != TARGET_HALTED)
{
- erase_check_algorithm = NULL;
+ return ERROR_TARGET_NOT_HALTED;
}
-
- if (erase_check_algorithm)
- {
- u8 erase_check_code_buf[((sizeof(erase_check_code)+3)/4)*4];
- LOG_DEBUG("Running fast flash erase check");
- for (i = 0; i < sizeof(erase_check_code)/sizeof(*erase_check_code); i++)
- target_buffer_set_u16(target, erase_check_code_buf + (i*2), erase_check_code[i]);
-
- /* write algorithm code to working area */
- if ((retval=target->type->write_memory(target, erase_check_algorithm->address, 2, sizeof(erase_check_code)/sizeof(*erase_check_code), erase_check_code_buf))==ERROR_OK)
- {
- for (i = 0; i < bank->num_sectors; i++)
- {
- u32 address = bank->base + bank->sectors[i].offset;
- u32 size = bank->sectors[i].size;
-
- reg_param_t reg_params[3];
- armv7m_algorithm_t arm_info;
-
- arm_info.common_magic = ARMV7M_COMMON_MAGIC;
- arm_info.core_mode = ARMV7M_MODE_ANY;
- arm_info.core_state = ARMV7M_STATE_THUMB;
-
- init_reg_param(®_params[0], "r0", 32, PARAM_OUT);
- buf_set_u32(reg_params[0].value, 0, 32, address);
-
- init_reg_param(®_params[1], "r1", 32, PARAM_OUT);
- buf_set_u32(reg_params[1].value, 0, 32, size);
-
- init_reg_param(®_params[2], "r2", 32, PARAM_IN_OUT);
- buf_set_u32(reg_params[2].value, 0, 32, 0xff);
-
- if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params, erase_check_algorithm->address,
- erase_check_algorithm->address + sizeof(erase_check_code) - 2, 10000, &arm_info)) != ERROR_OK)
- break;
-
- if (buf_get_u32(reg_params[2].value, 0, 32) == 0xff)
- bank->sectors[i].is_erased = 1;
- else
- bank->sectors[i].is_erased = 0;
-
- destroy_reg_param(®_params[0]);
- destroy_reg_param(®_params[1]);
- destroy_reg_param(®_params[2]);
- }
- if (i == bank->num_sectors)
- {
- fast_check = 1;
- }
- }
- target_free_working_area(target, erase_check_algorithm);
- }
-#endif
- if (!fast_check)
+ for (i = 0; i < bank->num_sectors; i++)
{
- /* try ARM7 instead */
-
- u32 erase_check_code[] =
- {
- 0xe4d03001, /* ldrb r3, [r0], #1 */
- 0xe0022003, /* and r2, r2, r3 */
- 0xe2511001, /* subs r1, r1, #1 */
- 0x1afffffb, /* b -4 */
- 0xeafffffe /* b 0 */
- };
-
- /* make sure we have a working area */
- if (target_alloc_working_area(target, 20, &erase_check_algorithm) == ERROR_OK)
+ 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)
{
- u8 erase_check_code_buf[5 * 4];
-
- for (i = 0; i < 5; i++)
- target_buffer_set_u32(target, erase_check_code_buf + (i*4), erase_check_code[i]);
-
- /* write algorithm code to working area */
- if ((retval=target->type->write_memory(target, erase_check_algorithm->address, 4, 5, erase_check_code_buf))==ERROR_OK)
- {
- for (i = 0; i < bank->num_sectors; i++)
- {
- u32 address = bank->base + bank->sectors[i].offset;
- u32 size = bank->sectors[i].size;
-
- 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(®_params[0], "r0", 32, PARAM_OUT);
- buf_set_u32(reg_params[0].value, 0, 32, address);
-
- init_reg_param(®_params[1], "r1", 32, PARAM_OUT);
- buf_set_u32(reg_params[1].value, 0, 32, size);
-
- init_reg_param(®_params[2], "r2", 32, PARAM_IN_OUT);
- buf_set_u32(reg_params[2].value, 0, 32, 0xff);
-
- if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params,
- erase_check_algorithm->address, erase_check_algorithm->address + 0x10, 10000, &armv4_5_info)) != ERROR_OK)
- break;
-
- if (buf_get_u32(reg_params[2].value, 0, 32) == 0xff)
- bank->sectors[i].is_erased = 1;
- else
- bank->sectors[i].is_erased = 0;
-
- destroy_reg_param(®_params[0]);
- destroy_reg_param(®_params[1]);
- destroy_reg_param(®_params[2]);
- }
- if (i == bank->num_sectors)
- {
- fast_check = 1;
- }
- }
- target_free_working_area(target, erase_check_algorithm);
+ 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");
- 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 default_flash_mem_blank_check(bank);
}
return ERROR_OK;
Code Review / openocd.git / blobdiff