diff options
| -rw-r--r-- | doc/openocd.texi | 27 | ||||
| -rw-r--r-- | src/flash/cfi.c | 8 |
2 files changed, 26 insertions, 9 deletions
diff --git a/doc/openocd.texi b/doc/openocd.texi index 786af94b..19736ace 100644 --- a/doc/openocd.texi +++ b/doc/openocd.texi @@ -250,7 +250,16 @@ Cirrus Logic EP93xx based single-board computer bit-banging (in development) @item @b{jtag_speed} <@var{number}> @cindex jtag_speed Limit the maximum speed of the JTAG interface. Usually, a value of zero means maximum -speed. The actual effect of this option depends on the JTAG interface used. +speed. The actual effect of this option depends on the JTAG interface used. + +@itemize @minus +@item wiggler: maximum speed / @var{number} +@item ft2232: 6MHz / (@var{number}+1) +@item amt jtagaccel: 8 / 2**@var{number} +@end itemize + +Note: Make sure the jtag clock is no more than @math{1/6th × CPU-Clock}. This is +especially true for synthesized cores (-S). @item @b{reset_config} <@var{signals}> [@var{combination}] [@var{trst_type}] [@var{srst_type}] @cindex reset_config @@ -384,6 +393,12 @@ SRST signals on external connector Hitex STR9 comstick @item stm32stick Hitex STM32 Performance Stick +@item flyswatter +Tin Can Tools Flyswatter +@item turtelizer2 +egnite Software turtelizer2 +@item oocdlink +OOCDLink @end itemize @item @b{ft2232_vid_pid} <@var{vid}> <@var{pid}> @@ -545,11 +560,13 @@ CFI flashes require the number of the target they're connected to as an addition argument. The CFI driver makes use of a working area (specified for the target) to significantly speed up operation. +@var{chip_width} and @var{bus_width} are specified in bytes. + @subsection at91sam7 options @cindex at91sam7 options -@b{flash bank at91sam7} 0 0 0 0 <@var{target#>}> -AT91SAM7 flashes only require the target#, all other values are looked up after +@b{flash bank at91sam7} 0 0 0 0 <@var{target#}> +AT91SAM7 flashes only require the @var{target#}, all other values are looked up after reading the chip-id and type. @subsection str7 options @@ -581,13 +598,13 @@ Use the standard str9 driver for programming. @cindex stellaris (LM3Sxxx) options @b{flash bank stellaris} <@var{base}> <@var{size}> 0 0 <@var{target#}> -stellaris flash plugin only require the target#. +stellaris flash plugin only require the @var{target#}. @subsection stm32x options @cindex stm32x options @b{flash bank stm32x} <@var{base}> <@var{size}> 0 0 <@var{target#}> -stm32x flash plugin only require the target#. +stm32x flash plugin only require the @var{target#}. @node Commands @chapter Commands diff --git a/src/flash/cfi.c b/src/flash/cfi.c index cc5a69e1..cf80a72c 100644 --- a/src/flash/cfi.c +++ b/src/flash/cfi.c @@ -612,15 +612,15 @@ int cfi_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char ** if ((strtoul(args[4], NULL, 0) > CFI_MAX_CHIP_WIDTH) || (strtoul(args[3], NULL, 0) > CFI_MAX_BUS_WIDTH)) { - ERROR("chip and bus width have to specified in byte"); + ERROR("chip and bus width have to specified in bytes"); return ERROR_FLASH_BANK_INVALID; } cfi_info = malloc(sizeof(cfi_flash_bank_t)); bank->driver_priv = cfi_info; - - cfi_info->write_algorithm = NULL; - cfi_info->erase_check_algorithm = NULL; + + cfi_info->write_algorithm = NULL; + cfi_info->erase_check_algorithm = NULL; cfi_info->x16_as_x8 = 0; cfi_info->jedec_probe = 0; |