Signed-off-by: Michael Schwingen <mich...@schwingen.org>
---
src/flash/nor/cfi.c | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index f25f46d..10a8f62 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -1229,54 +1229,54 @@ static int cfi_intel_write_block(struct flash_bank
*bank, uint8_t *buffer,
/* see contib/loaders/flash/armv4_5_cfi_intel_32.s for src */
static const uint32_t word_32_code[] = {
0xe4904004, /* loop: ldr r4, [r0], #4 */
- 0xe5813000, /* str r3, [r1] */
- 0xe5814000, /* str r4, [r1] */
+ 0xe5813000, /* str r3, [r1] */
+ 0xe5814000, /* str r4, [r1] */
0xe5914000, /* busy: ldr r4, [r1] */
0xe0047005, /* and r7, r4, r5 */
0xe1570005, /* cmp r7, r5 */
0x1afffffb, /* bne busy */
- 0xe1140006, /* tst r4, r6 */
+ 0xe1140006, /* tst r4, r6 */
0x1a000003, /* bne done */
0xe2522001, /* subs r2, r2, #1 */
- 0x0a000001, /* beq done */
+ 0x0a000001, /* beq done */
0xe2811004, /* add r1, r1 #4 */
- 0xeafffff2, /* b loop */
+ 0xeafffff2, /* b loop */
0xeafffffe /* done: b -2 */
};
/* see contib/loaders/flash/armv4_5_cfi_intel_16.s for src */
static const uint32_t word_16_code[] = {
0xe0d040b2, /* loop: ldrh r4, [r0], #2 */
- 0xe1c130b0, /* strh r3, [r1] */
- 0xe1c140b0, /* strh r4, [r1] */
+ 0xe1c130b0, /* strh r3, [r1] */
+ 0xe1c140b0, /* strh r4, [r1] */
0xe1d140b0, /* busy ldrh r4, [r1] */
0xe0047005, /* and r7, r4, r5 */
0xe1570005, /* cmp r7, r5 */
0x1afffffb, /* bne busy */
- 0xe1140006, /* tst r4, r6 */
+ 0xe1140006, /* tst r4, r6 */
0x1a000003, /* bne done */
0xe2522001, /* subs r2, r2, #1 */
- 0x0a000001, /* beq done */
+ 0x0a000001, /* beq done */
0xe2811002, /* add r1, r1 #2 */
- 0xeafffff2, /* b loop */
+ 0xeafffff2, /* b loop */
0xeafffffe /* done: b -2 */
};
/* see contib/loaders/flash/armv4_5_cfi_intel_8.s for src */
static const uint32_t word_8_code[] = {
0xe4d04001, /* loop: ldrb r4, [r0], #1 */
- 0xe5c13000, /* strb r3, [r1] */
- 0xe5c14000, /* strb r4, [r1] */
+ 0xe5c13000, /* strb r3, [r1] */
+ 0xe5c14000, /* strb r4, [r1] */
0xe5d14000, /* busy ldrb r4, [r1] */
0xe0047005, /* and r7, r4, r5 */
0xe1570005, /* cmp r7, r5 */
0x1afffffb, /* bne busy */
- 0xe1140006, /* tst r4, r6 */
+ 0xe1140006, /* tst r4, r6 */
0x1a000003, /* bne done */
0xe2522001, /* subs r2, r2, #1 */
- 0x0a000001, /* beq done */
+ 0x0a000001, /* beq done */
0xe2811001, /* add r1, r1 #1 */
- 0xeafffff2, /* b loop */
+ 0xeafffff2, /* b loop */
0xeafffffe /* done: b -2 */
};
uint8_t target_code[4*CFI_MAX_INTEL_CODESIZE];
@@ -1550,12 +1550,12 @@ static int cfi_spansion_write_block(struct flash_bank
*bank, uint8_t *buffer,
0x1a000004, /* bne 81ac <sp_16_done>
*/
/*
*/
/* 00008198 <sp_16_cont>:
*/
- 0xe2522001, /* subs r2, r2, #1 ; 0x1 */
- 0x03a05080, /* moveq r5, #128 ; 0x80 */
- 0x0a000001, /* beq 81ac <sp_16_done> */
- 0xe2811002, /* add r1, r1, #2 ; 0x2 */
- 0xeaffffe8, /* b 8158 <sp_16_code> */
- /*
*/
+ 0xe2522001, /* subs r2, r2, #1 ; 0x1 */
+ 0x03a05080, /* moveq r5, #128 ; 0x80 */
+ 0x0a000001, /* beq 81ac <sp_16_done> */
+ 0xe2811002, /* add r1, r1, #2 ; 0x2 */
+ 0xeaffffe8, /* b 8158 <sp_16_code> */
+ /*
*/
/* 000081ac <sp_16_done>:
*/
0xeafffffe /* b 81ac <sp_16_done>
*/
};
@@ -1581,7 +1581,7 @@ static int cfi_spansion_write_block(struct flash_bank
*bank, uint8_t *buffer,
0x0a000001, /* beq 81ac <sp_16_done>
*/
0xe2811002, /* add r1, r1, #2 ; 0x2
*/
0xeafffff0, /* b 8158 <sp_16_code>
*/
- /*
*/
+ /*
*/
/* 000081ac <sp_16_done>:
*/
0xeafffffe /* b 81ac <sp_16_done>
*/
};
--
1.7.2.3
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
