X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fcfi.c;h=97d3f190c42d26ce39d346a5ccd9a38a6bb0f37d;hb=c4b52f8fd7b06f8cec5db5cdf33fd984a255ceaa;hp=5724c184f6270e951b310e0e91e9ec8faec5a756;hpb=ba2fbe22470915359e1905aaad4c613eacbdf6dc;p=openocd.git

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 5724c184f6..97d3f190c4 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -1103,19 +1103,6 @@ static int cfi_protect(struct flash_bank *bank, int set, int first, int last)
 	}
 }
 
-/* Convert code image to target endian
- * FIXME create general block conversion fcts in target.c?) */
-static void cfi_fix_code_endian(struct target *target, uint8_t *dest,
-	const uint32_t *src, uint32_t count)
-{
-	uint32_t i;
-	for (i = 0; i < count; i++) {
-		target_buffer_set_u32(target, dest, *src);
-		dest += 4;
-		src++;
-	}
-}
-
 static uint32_t cfi_command_val(struct flash_bank *bank, uint8_t cmd)
 {
 	struct target *target = bank->target;
@@ -1139,7 +1126,7 @@ static uint32_t cfi_command_val(struct flash_bank *bank, uint8_t cmd)
 	}
 }
 
-static int cfi_intel_write_block(struct flash_bank *bank, uint8_t *buffer,
+static int cfi_intel_write_block(struct flash_bank *bank, const uint8_t *buffer,
 	uint32_t address, uint32_t count)
 {
 	struct target *target = bank->target;
@@ -1264,7 +1251,8 @@ static int cfi_intel_write_block(struct flash_bank *bank, uint8_t *buffer,
 				"Increase CFI_MAX_INTEL_CODESIZE and recompile.");
 		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	}
-	cfi_fix_code_endian(target, target_code, target_code_src, target_code_size / 4);
+
+	target_buffer_set_u32_array(target, target_code, target_code_size / 4, target_code_src);
 
 	/* Get memory for block write handler */
 	retval = target_alloc_working_area(target,
@@ -1391,7 +1379,7 @@ cleanup:
 	return retval;
 }
 
-static int cfi_spansion_write_block_mips(struct flash_bank *bank, uint8_t *buffer,
+static int cfi_spansion_write_block_mips(struct flash_bank *bank, const uint8_t *buffer,
 	uint32_t address, uint32_t count)
 {
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
@@ -1504,7 +1492,8 @@ static int cfi_spansion_write_block_mips(struct flash_bank *bank, uint8_t *buffe
 		LOG_ERROR("Out of memory");
 		return ERROR_FAIL;
 	}
-	cfi_fix_code_endian(target, target_code, target_code_src, target_code_size / 4);
+
+	target_buffer_set_u32_array(target, target_code, target_code_size / 4, target_code_src);
 
 	/* allocate working area */
 	retval = target_alloc_working_area(target, target_code_size,
@@ -1603,7 +1592,7 @@ static int cfi_spansion_write_block_mips(struct flash_bank *bank, uint8_t *buffe
 	return retval;
 }
 
-static int cfi_spansion_write_block(struct flash_bank *bank, uint8_t *buffer,
+static int cfi_spansion_write_block(struct flash_bank *bank, const uint8_t *buffer,
 	uint32_t address, uint32_t count)
 {
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
@@ -1883,7 +1872,8 @@ static int cfi_spansion_write_block(struct flash_bank *bank, uint8_t *buffer,
 		LOG_ERROR("Out of memory");
 		return ERROR_FAIL;
 	}
-	cfi_fix_code_endian(target, target_code, target_code_src, target_code_size / 4);
+
+	target_buffer_set_u32_array(target, target_code, target_code_size / 4, target_code_src);
 
 	/* allocate working area */
 	retval = target_alloc_working_area(target, target_code_size,
@@ -2012,7 +2002,7 @@ static int cfi_intel_write_word(struct flash_bank *bank, uint8_t *word, uint32_t
 	return ERROR_OK;
 }
 
-static int cfi_intel_write_words(struct flash_bank *bank, uint8_t *word,
+static int cfi_intel_write_words(struct flash_bank *bank, const uint8_t *word,
 	uint32_t wordcount, uint32_t address)
 {
 	int retval;
@@ -2132,7 +2122,7 @@ static int cfi_spansion_write_word(struct flash_bank *bank, uint8_t *word, uint3
 	return ERROR_OK;
 }
 
-static int cfi_spansion_write_words(struct flash_bank *bank, uint8_t *word,
+static int cfi_spansion_write_words(struct flash_bank *bank, const uint8_t *word,
 	uint32_t wordcount, uint32_t address)
 {
 	int retval;
@@ -2225,7 +2215,7 @@ static int cfi_write_word(struct flash_bank *bank, uint8_t *word, uint32_t addre
 	return ERROR_FLASH_OPERATION_FAILED;
 }
 
-static int cfi_write_words(struct flash_bank *bank, uint8_t *word,
+static int cfi_write_words(struct flash_bank *bank, const uint8_t *word,
 	uint32_t wordcount, uint32_t address)
 {
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
@@ -2322,7 +2312,7 @@ static int cfi_read(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, u
 	return ERROR_OK;
 }
 
-static int cfi_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int cfi_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count)
 {
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
 	struct target *target = bank->target;