X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=contrib%2Floaders%2Fflash%2Fstm32%2Fstm32f2x.S;fp=contrib%2Floaders%2Fflash%2Fstm32f2x.S;h=f6f5b30a490e9163aa55bd639d97e8e643db5bf6;hp=0dd1223192ea10310cf0b9dacec5104f878108ba;hb=b941e2e727387c6c8880990b829a48b289dfc90b;hpb=2eadf1e847f4880c698cae8dca857714e464e471

diff --git a/contrib/loaders/flash/stm32f2x.S b/contrib/loaders/flash/stm32/stm32f2x.S
similarity index 96%
rename from contrib/loaders/flash/stm32f2x.S
rename to contrib/loaders/flash/stm32/stm32f2x.S
index 0dd1223192..f6f5b30a49 100644
--- a/contrib/loaders/flash/stm32f2x.S
+++ b/contrib/loaders/flash/stm32/stm32f2x.S
@@ -25,7 +25,6 @@
 	.syntax unified
 	.cpu cortex-m3
 	.thumb
-	.thumb_func
 
 /*
  * Params :
@@ -44,6 +43,11 @@
 #define STM32_FLASH_CR_OFFSET	0x10			/* offset of CR register in FLASH struct */
 #define STM32_FLASH_SR_OFFSET	0x0c			/* offset of SR register in FLASH struct */
 
+#define STM32_PROG16		0x101			/* PG | PSIZE_16*/
+
+	.thumb_func
+	.global	_start
+_start:
 wait_fifo:
 	ldr 	r8, [r0, #0]	/* read wp */
 	cmp 	r8, #0			/* abort if wp == 0 */
@@ -52,7 +56,7 @@ wait_fifo:
 	cmp 	r7, r8			/* wait until rp != wp */
 	beq 	wait_fifo
 
-	ldr		r6, STM32_PROG16
+	ldr		r6, =STM32_PROG16
 	str		r6, [r4, #STM32_FLASH_CR_OFFSET]
 	ldrh 	r6, [r7], #0x02						/* read one half-word from src, increment ptr */
 	strh 	r6, [r2], #0x02						/* write one half-word from src, increment ptr */
@@ -78,4 +82,4 @@ exit:
 	mov		r0, r6			/* return status in r0 */
 	bkpt	#0x00
 
-STM32_PROG16: .word 0x101 	/* PG | PSIZE_16*/
+	.pool