flash/nor, contrib/loaders: add stm32 loaders Makefile and generated .inc

Flash loaders refactored to the new style - use generated .inc
instead of hexadecimal machine code in the flash driver source.

Change-Id: If65a2099589e210f9450819b467d67819fd841fc
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/4439
Tested-by: jenkins
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>

11 files changed, 82 insertions, 43 deletions

diff --git a/contrib/loaders/flash/stm32/Makefile b/contrib/loaders/flash/stm32/Makefile
new file mode 100644
index 0000000..b58b412
--- /dev/null
+++ b/contrib/loaders/flash/stm32/Makefile
@@ -0,0 +1,28 @@
+BIN2C = ../../../../src/helper/bin2char.sh
+
+CROSS_COMPILE ?= arm-none-eabi-
+
+CC=$(CROSS_COMPILE)gcc
+OBJCOPY=$(CROSS_COMPILE)objcopy
+OBJDUMP=$(CROSS_COMPILE)objdump
+
+CFLAGS = -static -nostartfiles -mlittle-endian -Wa,-EL
+
+all: stm32f1x.inc stm32f2x.inc stm32h7x.inc stm32l4x.inc stm32lx.inc
+
+.PHONY: clean
+
+%.elf: %.S
+	$(CC) $(CFLAGS) $< -o $@
+
+%.lst: %.elf
+	$(OBJDUMP) -S $< > $@
+
+%.bin: %.elf
+	$(OBJCOPY) -Obinary $< $@
+
+%.inc: %.bin
+	$(BIN2C) < $< > $@
+
+clean:
+	-rm -f *.elf *.lst *.bin *.inc
diff --git a/contrib/loaders/flash/stm32f1x.S b/contrib/loaders/flash/stm32/stm32f1x.S
index 5ce463d..7b64c67 100644
--- a/contrib/loaders/flash/stm32f1x.S
+++ b/contrib/loaders/flash/stm32/stm32f1x.S
@@ -22,8 +22,6 @@
 	.syntax unified
 	.cpu cortex-m0
 	.thumb
-	.thumb_func
-	.global write
 
 	/* Params:
 	 * r0 - flash base (in), status (out)
@@ -39,6 +37,9 @@
 
 #define STM32_FLASH_SR_OFFSET 0x0c /* offset of SR register from flash reg base */
 
+	.thumb_func
+	.global _start
+_start:
 wait_fifo:
 	ldr 	r6, [r2, #0]	/* read wp */
 	cmp 	r6, #0			/* abort if wp == 0 */
diff --git a/contrib/loaders/flash/stm32/stm32f1x.inc b/contrib/loaders/flash/stm32/stm32f1x.inc
new file mode 100644
index 0000000..7f9454b
--- /dev/null
+++ b/contrib/loaders/flash/stm32/stm32f1x.inc
@@ -0,0 +1,5 @@
+/* Autogenerated with ../../../../src/helper/bin2char.sh */
+0x16,0x68,0x00,0x2e,0x18,0xd0,0x55,0x68,0xb5,0x42,0xf9,0xd0,0x2e,0x88,0x26,0x80,
+0x02,0x35,0x02,0x34,0xc6,0x68,0x01,0x27,0x3e,0x42,0xfb,0xd1,0x14,0x27,0x3e,0x42,
+0x08,0xd1,0x9d,0x42,0x01,0xd3,0x15,0x46,0x08,0x35,0x55,0x60,0x01,0x39,0x00,0x29,
+0x02,0xd0,0xe5,0xe7,0x00,0x20,0x50,0x60,0x30,0x46,0x00,0xbe,
diff --git a/contrib/loaders/flash/stm32f2x.S b/contrib/loaders/flash/stm32/stm32f2x.S
index 0dd1223..f6f5b30 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
diff --git a/contrib/loaders/flash/stm32/stm32f2x.inc b/contrib/loaders/flash/stm32/stm32f2x.inc
new file mode 100644
index 0000000..3da2940
--- /dev/null
+++ b/contrib/loaders/flash/stm32/stm32f2x.inc
@@ -0,0 +1,6 @@
+/* Autogenerated with ../../../../src/helper/bin2char.sh */
+0xd0,0xf8,0x00,0x80,0xb8,0xf1,0x00,0x0f,0x1b,0xd0,0x47,0x68,0x47,0x45,0xf7,0xd0,
+0x0d,0x4e,0x26,0x61,0x37,0xf8,0x02,0x6b,0x22,0xf8,0x02,0x6b,0xbf,0xf3,0x4f,0x8f,
+0xe6,0x68,0x16,0xf4,0x80,0x3f,0xfb,0xd1,0x16,0xf0,0xf0,0x0f,0x07,0xd1,0x8f,0x42,
+0x28,0xbf,0x00,0xf1,0x08,0x07,0x47,0x60,0x01,0x3b,0x13,0xb1,0xe0,0xe7,0x00,0x21,
+0x41,0x60,0x30,0x46,0x00,0xbe,0x00,0x00,0x01,0x01,0x00,0x00,
diff --git a/contrib/loaders/flash/stm32h7x.S b/contrib/loaders/flash/stm32/stm32h7x.S
index 0f5ea99..f910bfb 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
+
diff --git a/contrib/loaders/flash/stm32/stm32h7x.inc b/contrib/loaders/flash/stm32/stm32h7x.inc
new file mode 100644
index 0000000..174354c
--- /dev/null
+++ b/contrib/loaders/flash/stm32/stm32h7x.inc
@@ -0,0 +1,7 @@
+/* Autogenerated with ../../../../src/helper/bin2char.sh */
+0x45,0x68,0x06,0x68,0x26,0xb3,0x76,0x1b,0x42,0xbf,0x76,0x18,0x36,0x1a,0x08,0x3e,
+0x20,0x2e,0xf6,0xd3,0x4f,0xf0,0x32,0x06,0xe6,0x60,0x4f,0xf0,0x08,0x07,0x55,0xf8,
+0x04,0x6b,0x42,0xf8,0x04,0x6b,0xbf,0xf3,0x4f,0x8f,0x8d,0x42,0x28,0xbf,0x00,0xf1,
+0x08,0x05,0x01,0x3f,0xf3,0xd1,0x26,0x69,0x16,0xf0,0x01,0x0f,0xfb,0xd1,0x05,0x4f,
+0x3e,0x42,0x03,0xd1,0x45,0x60,0x01,0x3b,0xdb,0xd1,0x01,0xe0,0x00,0x27,0x47,0x60,
+0x30,0x46,0x00,0xbe,0x00,0x00,0xee,0x03,
diff --git a/contrib/loaders/flash/stm32l4x.S b/contrib/loaders/flash/stm32/stm32l4x.S
index 799dec5..9c49016 100644
--- a/contrib/loaders/flash/stm32l4x.S
+++ b/contrib/loaders/flash/stm32/stm32l4x.S
@@ -27,20 +27,6 @@
 	.syntax unified
 	.cpu cortex-m4
 	.thumb
-	.thumb_func
-
-/* To assemble:
- * arm-none-eabi-gcc -c stm32l4x.S
- *
- * To disassemble:
- * arm-none-eabi-objdump -o stm32l4x.o
- *
- * To generate binary file:
- * arm-none-eabi-objcopy -O binary stm32l4x.o stm32l4_flash_write_code.bin
- *
- * To generate include file:
- * xxd -i stm32l4_flash_write_code.bin
- */
 
 /*
  * Params :
@@ -59,6 +45,11 @@
 #define STM32_FLASH_CR_OFFSET	0x14	/* offset of CR register in FLASH struct */
 #define STM32_FLASH_SR_OFFSET	0x10	/* offset of SR register in FLASH struct */
 
+#define STM32_PROG	 0x1	/* PG */
+
+	.thumb_func
+	.global _start
+_start:
 wait_fifo:
 	ldr 	r8, [r0, #0]	/* read wp */
 	cmp 	r8, #0		/* abort if wp == 0 */
@@ -71,7 +62,7 @@ wait_fifo:
 	cmp 	r6, #8		/* wait until 8 bytes are available */
 	bcc 	wait_fifo
 
-	ldr	r6, STM32_PROG
+	ldr	r6, =STM32_PROG
 	str	r6, [r4, #STM32_FLASH_CR_OFFSET]
 	ldrd 	r6, [r5], #0x08	/* read one word from src, increment ptr */
 	strd 	r6, [r2], #0x08	/* write one word to dst, increment ptr */
@@ -97,4 +88,5 @@ exit:
 	mov	r0, r6		/* return status in r0 */
 	bkpt	#0x00
 
-STM32_PROG: .word 0x1 	/* PG */
+	.pool
+
diff --git a/contrib/loaders/flash/stm32/stm32l4x.inc b/contrib/loaders/flash/stm32/stm32l4x.inc
new file mode 100644
index 0000000..4065d14
--- /dev/null
+++ b/contrib/loaders/flash/stm32/stm32l4x.inc
@@ -0,0 +1,7 @@
+/* Autogenerated with ../../../../src/helper/bin2char.sh */
+0xd0,0xf8,0x00,0x80,0xb8,0xf1,0x00,0x0f,0x20,0xd0,0x45,0x68,0xb8,0xeb,0x05,0x06,
+0x44,0xbf,0x76,0x18,0x36,0x1a,0x08,0x2e,0xf2,0xd3,0x0d,0x4e,0x66,0x61,0xf5,0xe8,
+0x02,0x67,0xe2,0xe8,0x02,0x67,0xbf,0xf3,0x4f,0x8f,0x26,0x69,0x16,0xf4,0x80,0x3f,
+0xfb,0xd1,0x16,0xf0,0xfa,0x0f,0x07,0xd1,0x8d,0x42,0x28,0xbf,0x00,0xf1,0x08,0x05,
+0x45,0x60,0x01,0x3b,0x13,0xb1,0xdb,0xe7,0x00,0x21,0x41,0x60,0x30,0x46,0x00,0xbe,
+0x01,0x00,0x00,0x00,
diff --git a/contrib/loaders/flash/stm32lx.S b/contrib/loaders/flash/stm32/stm32lx.S
index 8f9fd0b..bcae7a4 100644
--- a/contrib/loaders/flash/stm32lx.S
+++ b/contrib/loaders/flash/stm32/stm32lx.S
@@ -28,13 +28,10 @@
  ***************************************************************************/
 
 
-// Build : arm-eabi-gcc -c stm32lx.S
 	.text
 	.syntax unified
 	.cpu cortex-m0
 	.thumb
-	.thumb_func
-	.global write
 
 /*
 	r0 - destination address
@@ -42,6 +39,9 @@
 	r2 - count
 */
 
+	.thumb_func
+	.global _start
+_start:
 	// r2 = source + count * 4
 	lsls	r2, r2, #2
 	adds	r2, r1, r2
diff --git a/contrib/loaders/flash/stm32/stm32lx.inc b/contrib/loaders/flash/stm32/stm32lx.inc
new file mode 100644
index 0000000..eaaf184
--- /dev/null
+++ b/contrib/loaders/flash/stm32/stm32lx.inc
@@ -0,0 +1,2 @@
+/* Autogenerated with ../../../../src/helper/bin2char.sh */
+0x92,0x00,0x8a,0x18,0x01,0xe0,0x08,0xc9,0x08,0xc0,0x91,0x42,0xfb,0xd1,0x00,0xbe,