diff options
| author | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-06-14 09:47:00 +0000 |
|---|---|---|
| committer | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-06-14 09:47:00 +0000 |
| commit | 53d1f9b2ca5718e4996e9cf3406f857d0ed26df2 (patch) | |
| tree | 76c0dbf27a9114fb6f8a4c9f71af6117716a05d5 /src/flash/flash.c | |
| parent | 7087b66f19a7d60025f7315baa26d682804f3640 (diff) | |
| download | openocd+libswd-53d1f9b2ca5718e4996e9cf3406f857d0ed26df2.tar.gz openocd+libswd-53d1f9b2ca5718e4996e9cf3406f857d0ed26df2.tar.bz2 openocd+libswd-53d1f9b2ca5718e4996e9cf3406f857d0ed26df2.tar.xz openocd+libswd-53d1f9b2ca5718e4996e9cf3406f857d0ed26df2.zip | |
- added manpage for OpenOCD (thanks to Uwe Hermann)
- fixed bug in ARM926EJ-S cache handling that caused cache linefills to be disabled after first debug entry
- added support for auto image type detection (thanks to Vincent Palatin)
- further work on ETM trace decoding (tested with a ETB interface using an ETM in normal 16-bit port mode, still experimental)
git-svn-id: svn://svn.berlios.de/openocd/trunk@169 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/flash/flash.c')
| -rw-r--r-- | src/flash/flash.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/flash/flash.c b/src/flash/flash.c index 58a467d2..fecb89b7 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -511,8 +511,6 @@ int handle_flash_write_command(struct command_context_s *cmd_ctx, char *cmd, cha duration_start_measure(&duration); - identify_image_type(&image.type, (argc == 4) ? args[3] : NULL); - image.base_address_set = 1; image.base_address = strtoul(args[1], NULL, 0); @@ -526,7 +524,7 @@ int handle_flash_write_command(struct command_context_s *cmd_ctx, char *cmd, cha return ERROR_OK; } - if (image_open(&image, args[1], FILEIO_READ) != ERROR_OK) + if (image_open(&image, args[1], (argc == 4) ? args[3] : NULL) != ERROR_OK) { command_print(cmd_ctx, "flash write error: %s", image.error_str); return ERROR_OK; |