flash: less bogus errors
Removed bogus errors when trying to allocate a large a target memory buffer as possible. Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
This commit is contained in:
parent
70226c221f
commit
282e89c878
|
@ -227,7 +227,7 @@ static int aduc702x_write_block(struct flash_bank *bank, uint8_t *buffer, uint32
|
|||
}
|
||||
|
||||
/* 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)
|
||||
|
|
|
@ -1116,7 +1116,7 @@ static int cfi_intel_write_block(struct flash_bank *bank, uint8_t *buffer, uint3
|
|||
/* Get a workspace buffer for the data to flash starting with 32k size.
|
||||
Half size until buffer would be smaller 256 Bytem then fail back */
|
||||
/* FIXME Why 256 bytes, why not 32 bytes (smallest flash write page */
|
||||
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)
|
||||
|
@ -1444,7 +1444,7 @@ static int cfi_spansion_write_block(struct flash_bank *bank, uint8_t *buffer, ui
|
|||
}
|
||||
/* the following code still assumes target code is fixed 24*4 bytes */
|
||||
|
||||
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)
|
||||
|
|
|
@ -1288,7 +1288,7 @@ static int lpc2900_write(struct flash_bank *bank, uint8_t *buffer,
|
|||
reduced size if that fails. */
|
||||
struct working_area *warea;
|
||||
uint32_t buffer_size = lpc2900_info->max_ram_block - 1 * KiB;
|
||||
while( (retval = target_alloc_working_area(target,
|
||||
while( (retval = target_alloc_working_area_try(target,
|
||||
buffer_size + target_code_size,
|
||||
&warea)) != ERROR_OK )
|
||||
{
|
||||
|
|
|
@ -322,7 +322,7 @@ static int pic32mx_write_block(struct flash_bank *bank, uint8_t *buffer,
|
|||
return retval;
|
||||
|
||||
/* 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)
|
||||
|
|
|
@ -846,7 +846,7 @@ static int stellaris_write_block(struct flash_bank *bank,
|
|||
buffer_size = wcount * 4;
|
||||
|
||||
/* 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 <= buf_min)
|
||||
|
|
|
@ -481,7 +481,7 @@ static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer,
|
|||
return retval;
|
||||
|
||||
/* 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)
|
||||
|
|
|
@ -385,7 +385,7 @@ static int str9x_write_block(struct flash_bank *bank,
|
|||
(uint8_t*)str9x_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)
|
||||
|
|
Loading…
Reference in New Issue