From 53bbd36c7d5adfe86aef071e2effbbfa804d0054 Mon Sep 17 00:00:00 2001 From: ntfreak Date: Sun, 10 Feb 2008 15:08:44 +0000 Subject: [PATCH] - add autoprobe support to the stm32 flash driver git-svn-id: svn://svn.berlios.de/openocd/trunk@287 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- doc/openocd.texi | 4 +-- src/flash/stm32x.c | 81 +++++++++++++++++++++------------------------- src/flash/stm32x.h | 1 + 3 files changed, 40 insertions(+), 46 deletions(-) diff --git a/doc/openocd.texi b/doc/openocd.texi index 7c8bc0c6c..9e310f338 100644 --- a/doc/openocd.texi +++ b/doc/openocd.texi @@ -532,8 +532,8 @@ Supported variants are @option{ixp42x}, @option{ixp45x}, @option{ixp46x}, Configures a flash bank at <@var{base}> of <@var{size}> bytes and <@var{chip_width}> and <@var{bus_width}> bytes using the selected flash . -@item @b{flash autoerase} <@option{on}|@option{off}> -@cindex flash autoerase +@item @b{flash auto_erase} <@option{on}|@option{off}> +@cindex flash auto_erase auto erase flash banks prior to writing. Currently only works when using @option{flash write_image} command. Default is @option{off}. @end itemize diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c index e87e0cceb..5b16f57ae 100644 --- a/src/flash/stm32x.c +++ b/src/flash/stm32x.c @@ -40,6 +40,7 @@ int stm32x_erase(struct flash_bank_s *bank, int first, int last); int stm32x_protect(struct flash_bank_s *bank, int set, int first, int last); int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); int stm32x_probe(struct flash_bank_s *bank); +int stm32x_auto_probe(struct flash_bank_s *bank); int stm32x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int stm32x_protect_check(struct flash_bank_s *bank); int stm32x_erase_check(struct flash_bank_s *bank); @@ -60,7 +61,7 @@ flash_driver_t stm32x_flash = .protect = stm32x_protect, .write = stm32x_write, .probe = stm32x_probe, - .auto_probe = stm32x_probe, + .auto_probe = stm32x_auto_probe, .erase_check = stm32x_erase_check, .protect_check = stm32x_protect_check, .info = stm32x_info @@ -83,41 +84,6 @@ int stm32x_register_commands(struct command_context_s *cmd_ctx) return ERROR_OK; } -int stm32x_build_block_list(struct flash_bank_s *bank) -{ - int i; - int num_sectors = 0; - - switch (bank->size) - { - case 32 * 1024: - num_sectors = 32; - break; - case 64 * 1024: - num_sectors = 64; - break; - case 128 * 1024: - num_sectors = 128; - break; - default: - ERROR("BUG: unknown bank->size encountered"); - exit(-1); - } - - bank->num_sectors = num_sectors; - bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors); - - for (i = 0; i < num_sectors; i++) - { - bank->sectors[i].offset = i * 1024; - bank->sectors[i].size = 1024; - bank->sectors[i].is_erased = -1; - bank->sectors[i].is_protected = 1; - } - - return ERROR_OK; -} - /* flash bank stm32x 0 0 */ int stm32x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank) @@ -133,15 +99,8 @@ int stm32x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char stm32x_info = malloc(sizeof(stm32x_flash_bank_t)); bank->driver_priv = stm32x_info; - if (bank->base != 0x08000000) - { - WARNING("overriding flash base address for STM32x device with 0x08000000"); - bank->base = 0x08000000; - } - - stm32x_build_block_list(bank); - stm32x_info->write_algorithm = NULL; + stm32x_info->probed = 0; return ERROR_OK; } @@ -681,9 +640,43 @@ int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) int stm32x_probe(struct flash_bank_s *bank) { + target_t *target = bank->target; + stm32x_flash_bank_t *stm32x_info = bank->driver_priv; + int i; + u16 num_sectors; + + stm32x_info->probed = 0; + + /* get flash size from target */ + target_read_u16(target, 0x1FFFF7E0, &num_sectors); + INFO( "flash size = %dkbytes", num_sectors ); + + bank->base = 0x08000000; + bank->size = num_sectors * 1024; + bank->num_sectors = num_sectors; + bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors); + + for (i = 0; i < num_sectors; i++) + { + bank->sectors[i].offset = i * 1024; + bank->sectors[i].size = 1024; + bank->sectors[i].is_erased = -1; + bank->sectors[i].is_protected = 1; + } + + stm32x_info->probed = 1; + return ERROR_OK; } +int stm32x_auto_probe(struct flash_bank_s *bank) +{ + stm32x_flash_bank_t *stm32x_info = bank->driver_priv; + if (stm32x_info->probed) + return ERROR_OK; + return stm32x_probe(bank); +} + int stm32x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { return ERROR_OK; diff --git a/src/flash/stm32x.h b/src/flash/stm32x.h index b1d70e581..b79e1528f 100644 --- a/src/flash/stm32x.h +++ b/src/flash/stm32x.h @@ -34,6 +34,7 @@ typedef struct stm32x_flash_bank_s { stm32x_options_t option_bytes; working_area_t *write_algorithm; + int probed; } stm32x_flash_bank_t; /* stm32x register locations */