Remove bogus error messages when trying to allocate a
large chunk of target memory and then falling back to
a smaller one.
Signed-off-by: Øyvind Harboe <oyvind.har...@zylin.com>
---
src/flash/nor/str7x.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c
index d6468d2..58b1d81 100644
--- a/src/flash/nor/str7x.c
+++ b/src/flash/nor/str7x.c
@@ -424,10 +424,9 @@ static int str7x_write_block(struct flash_bank *bank,
uint8_t *buffer,
};
/* flash write code */
- if (target_alloc_working_area(target, sizeof(str7x_flash_write_code),
+ if (target_alloc_working_area_try(target,
sizeof(str7x_flash_write_code),
&str7x_info->write_algorithm) != ERROR_OK)
{
- LOG_WARNING("no working area available, can't do block memory
writes");
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
};
@@ -436,7 +435,7 @@ static int str7x_write_block(struct flash_bank *bank,
uint8_t *buffer,
(uint8_t*)str7x_flash_write_code);
/* memory buffer */
- while (target_alloc_working_area(target, buffer_size, &source) !=
ERROR_OK)
+ while (target_alloc_working_area_try(target, buffer_size, &source) !=
ERROR_OK)
{
buffer_size /= 2;
if (buffer_size <= 256)
@@ -565,6 +564,9 @@ static int str7x_write(struct flash_bank *bank, uint8_t
*buffer,
/* if block write failed (no sufficient working
area),
* we use normal (slow) single dword accesses */
LOG_WARNING("couldn't use block writes, falling
back to single memory accesses");
+ } else
+ {
+ return retval;
}
}
else
--
1.6.3.3
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
