diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2011-11-14 13:33:30 +0000 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2011-11-18 16:57:23 +0000 |
| commit | 88ca3aabfbc512a1701cd76e3ac9683b167e4299 (patch) | |
| tree | 9d40a0500e47081a20c7825c2af873fe7e6b8549 /src/flash | |
| parent | de1fb8c6ac6825656101bd8be106a9dde51c9850 (diff) | |
flash: cleanup stm32f2x loader
Change-Id: I89efdc45bcd61ded437d67d4cbee4c53345d4d76
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/197
Tested-by: jenkins
Diffstat (limited to 'src/flash')
| -rw-r--r-- | src/flash/nor/stm32f2x.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c index 0e8cec30..6f041b10 100644 --- a/src/flash/nor/stm32f2x.c +++ b/src/flash/nor/stm32f2x.c @@ -317,29 +317,28 @@ static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer, /* see contrib/loaders/flash/stm32f2x.S for src */ static const uint16_t stm32x_flash_write_code_16[] = { -// 00000000 <write>: - 0x4b07, // ldr r3, [pc, #28] (20 <STM32_PROG16>) - 0x6123, // str r3, [r4, #16] - 0xf830, 0x3b02, //ldrh.w r3, [r0], #2 - 0xf821, 0x3b02, //strh.w r3, [r1], #2 - - //0000000c <busy>: - 0x68e3, //ldr r3, [r4, #12] -0xf413, 0x3f80, // tst.w r3, #65536 ; 0x10000 -0xd0fb, //beq.n c <busy> -0xf013, 0x0ff0, //tst.w r3, #240 ; 0xf0 -0xd101, //bne.n 1e <exit> -0x3a01, //subs r2, #1 -0xd1f0, //bne.n 0 <write> - //0000001e <exit>: - 0xbe00, // bkpt 0x0000 - - //00000020 <STM32_PROG16>: - 0x0101, 0x0000, // .word 0x00000101 - + /* 00000000 <write>: */ + 0x4b07, /* ldr r3, [pc, #28] (20 <STM32_PROG16>) */ + 0x6123, /* str r3, [r4, #16] */ + 0xf830, 0x3b02, /* ldrh.w r3, [r0], #2 */ + 0xf821, 0x3b02, /* strh.w r3, [r1], #2 */ + + /* 0000000c <busy>: */ + 0x68e3, /* ldr r3, [r4, #12] */ + 0xf413, 0x3f80, /* tst.w r3, #65536 ; 0x10000 */ + 0xd0fb, /* beq.n c <busy> */ + 0xf013, 0x0ff0, /* tst.w r3, #240 ; 0xf0 */ + 0xd101, /* bne.n 1e <exit> */ + 0x3a01, /* subs r2, #1 */ + 0xd1f0, /* bne.n 0 <write> */ + /* 0000001e <exit>: */ + 0xbe00, /* bkpt 0x0000 */ + + /* 00000020 <STM32_PROG16>: */ + 0x0101, 0x0000, /* .word 0x00000101 */ }; - // Flip endian + /* Flip endian */ uint8_t stm32x_flash_write_code[sizeof(stm32x_flash_write_code_16)*2]; for (unsigned i = 0; i < sizeof(stm32x_flash_write_code_16) / 2; i++) { |