From: Esben Haabendal <esben@haabendal.dk>
Date: Wed, 4 Nov 2015 13:50:40 +0000 (+0100)
Subject: cfi: Fix fallback to memory writes
X-Git-Tag: v0.10.0-rc1~381
X-Git-Url: https://review.openocd.org/gitweb?a=commitdiff_plain;h=27a11258b2889a470025190cefc3ed9460688954;p=openocd.git

cfi: Fix fallback to memory writes

Change-Id: I2d09139b95ff62c62a0b071584e85a87494ed313
Signed-off-by: Esben Haabendal <esben@haabendal.dk>
Reviewed-on: http://openocd.zylin.com/3095
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
---

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 97d3f190c4..90d7d83dd2 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -1213,7 +1213,7 @@ static int cfi_intel_write_block(struct flash_bank *bank, const uint8_t *buffer,
 		arm_algo.core_state = ARM_STATE_ARM;
 	} else {
 		LOG_ERROR("Unknown architecture");
-		return ERROR_FAIL;
+		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	}
 
 	cfi_intel_clear_status_register(bank);
@@ -1811,7 +1811,7 @@ static int cfi_spansion_write_block(struct flash_bank *bank, const uint8_t *buff
 		arm_algo = &armv4_5_algo;
 	} else {
 		LOG_ERROR("Unknown architecture");
-		return ERROR_FAIL;
+		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	}
 
 	int target_code_size = 0;