From cc8b491856c9fee675732dc21a2307f5c9617f54 Mon Sep 17 00:00:00 2001 From: Tomas Vanek Date: Fri, 19 Nov 2021 22:03:44 +0100 Subject: [PATCH] flash/nor/core, target: don't ask for working mem if no target algo The command 'flash erase_check' showed the message 'Running slow fallback erase check - add working memory' even in the case the target didn't implement blank_check_memory. Change return code of target_blank_check_memory() in this case and sense it in default_flash_blank_check() and show a message without a request for working memory. Change-Id: I7cf9bf77742964b4f377c9ce48ca689e57d0882f Signed-off-by: Tomas Vanek Reviewed-on: https://review.openocd.org/c/openocd/+/6765 Tested-by: jenkins Reviewed-by: Tim Newsome --- src/flash/nor/core.c | 6 +++++- src/target/target.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/flash/nor/core.c b/src/flash/nor/core.c index 30d387ae0..f4ff5dfb3 100644 --- a/src/flash/nor/core.c +++ b/src/flash/nor/core.c @@ -429,7 +429,11 @@ int default_flash_blank_check(struct flash_bank *bank) bank->sectors[i].is_erased = block_array[i].result; retval = ERROR_OK; } else { - LOG_USER("Running slow fallback erase check - add working memory"); + if (retval == ERROR_NOT_IMPLEMENTED) + LOG_USER("Running slow fallback erase check"); + else + LOG_USER("Running slow fallback erase check - add working memory"); + retval = default_flash_mem_blank_check(bank); } free(block_array); diff --git a/src/target/target.c b/src/target/target.c index 596364cdc..76327b1c7 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -2590,7 +2590,7 @@ int target_blank_check_memory(struct target *target, } if (!target->type->blank_check_memory) - return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; + return ERROR_NOT_IMPLEMENTED; return target->type->blank_check_memory(target, blocks, num_blocks, erased_value); }