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

diff --git a/contrib/loaders/flash/stm32h7x.S b/contrib/loaders/flash/stm32/stm32h7x.S
similarity index 90%
rename from contrib/loaders/flash/stm32h7x.S
rename to contrib/loaders/flash/stm32/stm32h7x.S
index 0f5ea996f3..f910bfbb12 100644
--- a/contrib/loaders/flash/stm32h7x.S
+++ b/contrib/loaders/flash/stm32/stm32h7x.S
@@ -20,21 +20,6 @@
 	.syntax unified
 	.cpu cortex-m7
 	.thumb
-	.thumb_func
-
-/*
- * To assemble:
- * arm-none-eabi-gcc -c stm32h7x.S
- *
- * To disassemble:
- * arm-none-eabi-objdump -d stm32h7x.o
- *
- * To generate binary file:
- * arm-none-eabi-objcopy -O binary stm32h7x.o stm32h7_flash_write_code.bin
- *
- * To generate include file:
- * xxd -i stm32h7_flash_write_code.bin
- */
 
 /*
  * Code limitations:
@@ -67,7 +52,9 @@
 #define STM32_SR_ERROR_MASK		0x03ee0000	/* DBECCERR | SNECCERR | RDSERR | RDPERR | OPERR
 											   | INCERR | STRBERR | PGSERR | WRPERR */
 
-code:
+	.thumb_func
+	.global _start
+_start:
 	ldr		r5, [r0, #4]		/* read rp */
 
 wait_fifo:
@@ -100,7 +87,7 @@ busy:
 	tst		r6, #STM32_SR_BUSY_MASK
 	bne		busy				/* operation in progress, wait ... */
 
-	ldr		r7, stm32_sr_error_mask
+	ldr		r7, =STM32_SR_ERROR_MASK
 	tst		r6, r7
 	bne		error				/* fail... */
 
@@ -117,5 +104,5 @@ exit:
 	mov		r0, r6				/* return status in r0 */
 	bkpt	#0x00
 
-stm32_sr_error_mask:
-	.word	STM32_SR_ERROR_MASK
+	.pool
+