openocd: collapse JTAG rules for STM32F1 and STM32F2

flight/AHRS/Makefile

@@ -355,7 +355,7 @@ $(OUTDIR)/$(TARGET).bin.o: $(OUTDIR)/$(TARGET).bin
 $(eval $(call OPFW_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(BOARD_TYPE),$(BOARD_REVISION)))
 
 # Add jtag targets (program and wipe)
-$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(FW_BANK_BASE),$(FW_BANK_SIZE)))
+$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(FW_BANK_BASE),$(FW_BANK_SIZE),$(OPENOCD_CONFIG)))
 
 .PHONY: elf lss sym hex bin bino opfw
 elf: $(OUTDIR)/$(TARGET).elf

flight/CopterControl/Makefile

@@ -550,7 +550,7 @@ $(OUTDIR)/$(TARGET).bin.o: $(OUTDIR)/$(TARGET).bin
 $(eval $(call OPFW_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(BOARD_TYPE),$(BOARD_REVISION)))
 
 # Add jtag targets (program and wipe)
-$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(FW_BANK_BASE),$(FW_BANK_SIZE)))
+$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(FW_BANK_BASE),$(FW_BANK_SIZE),$(OPENOCD_CONFIG)))
 
 .PHONY: elf lss sym hex bin bino opfw
 elf: $(OUTDIR)/$(TARGET).elf

flight/INS/Makefile

@@ -363,7 +363,7 @@ $(OUTDIR)/$(TARGET).bin.o: $(OUTDIR)/$(TARGET).bin
 $(eval $(call OPFW_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(BOARD_TYPE),$(BOARD_REVISION)))
 
 # Add jtag targets (program and wipe)
-$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(FW_BANK_BASE),$(FW_BANK_SIZE)))
+$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(FW_BANK_BASE),$(FW_BANK_SIZE),$(OPENOCD_CONFIG)))
 
 .PHONY: elf lss sym hex bin bino opfw
 elf: $(OUTDIR)/$(TARGET).elf

flight/OpenPilot/Makefile

@@ -514,7 +514,7 @@ $(OUTDIR)/$(TARGET).bin.o: $(OUTDIR)/$(TARGET).bin
 $(eval $(call OPFW_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(BOARD_TYPE),$(BOARD_REVISION)))
 
 # Add jtag targets (program and wipe)
-$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(FW_BANK_BASE),$(FW_BANK_SIZE)))
+$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(FW_BANK_BASE),$(FW_BANK_SIZE),$(OPENOCD_CONFIG)))
 
 .PHONY: elf lss sym hex bin bino opfw
 elf:  $(OUTDIR)/$(TARGET).elf

flight/PipXtreme/Makefile

@@ -394,7 +394,7 @@ $(OUTDIR)/$(TARGET).bin.o: $(OUTDIR)/$(TARGET).bin
 $(eval $(call OPFW_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(BOARD_TYPE),$(BOARD_REVISION)))
 
 # Add jtag targets (program and wipe)
-$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(FW_BANK_BASE),$(FW_BANK_SIZE)))
+$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(FW_BANK_BASE),$(FW_BANK_SIZE),$(OPENOCD_CONFIG)))
 
 .PHONY: elf lss sym hex bin bino opfw
 elf: $(OUTDIR)/$(TARGET).elf

make/boards/ahrs/board-info.mk

@@ -9,6 +9,8 @@ BOARD               := STM32103CB_AHRS
 MODEL               := MD
 MODEL_SUFFIX        := 
 
+OPENOCD_CONFIG      := stm32f1x.cfg
+
 # Note: These must match the values in link_$(BOARD)_memory.ld
 BL_BANK_BASE        := 0x08000000  # Start of bootloader flash
 BL_BANK_SIZE        := 0x00002000  # Should include BD_INFO region

make/boards/coptercontrol/board-info.mk

@@ -9,6 +9,8 @@ BOARD               := STM32103CB_CC_Rev1
 MODEL               := MD
 MODEL_SUFFIX        := _CC
 
+OPENOCD_CONFIG      := stm32f1x.cfg
+
 # Note: These must match the values in link_$(BOARD)_memory.ld
 BL_BANK_BASE        := 0x08000000  # Start of bootloader flash
 BL_BANK_SIZE        := 0x00003000  # Should include BD_INFO region

make/boards/ins/board-info.mk

@@ -9,6 +9,8 @@ BOARD               := STM3210E_INS
 MODEL               := HD
 MODEL_SUFFIX        := _OP
 
+OPENOCD_CONFIG      := stm32f1x.cfg
+
 # Note: These must match the values in link_$(BOARD)_memory.ld
 BL_BANK_BASE        := 0x08000000  # Start of bootloader flash
 BL_BANK_SIZE        := 0x00002000  # Should include BD_INFO region

make/boards/openpilot/board-info.mk

@@ -9,6 +9,8 @@ BOARD               := STM3210E_OP
 MODEL               := HD
 MODEL_SUFFIX        := _OP
 
+OPENOCD_CONFIG      := stm32f1x.cfg
+
 # Note: These must match the values in link_$(BOARD)_memory.ld
 BL_BANK_BASE        := 0x08000000  # Start of bootloader flash
 BL_BANK_SIZE        := 0x00005000  # Should include BD_INFO region

make/firmware-defs.mk

@@ -201,6 +201,7 @@ endef
 # $(1) = Name of binary image to write
 # $(2) = Base of flash region to write/wipe
 # $(3) = Size of flash region to write/wipe
+# $(4) = OpenOCD configuration file to use
 define JTAG_TEMPLATE
 # ---------------------------------------------------------------------------
 # Options for OpenOCD flash-programming
@@ -213,7 +214,7 @@ OOCD_EXE ?= openocd
 OOCD_JTAG_SETUP  = -d0
 # interface and board/target settings (using the OOCD target-library here)
 OOCD_JTAG_SETUP += -s $(TOP)/flight/Project/OpenOCD
-OOCD_JTAG_SETUP += -f foss-jtag.revb.cfg -f stm32f1x.cfg
+OOCD_JTAG_SETUP += -f foss-jtag.revb.cfg -f $(4)
 
 # initialize
 OOCD_BOARD_RESET = -c init
@@ -244,48 +245,3 @@ wipe:
 		-c "shutdown"
 endef
 
-# $(1) = Name of binary image to write
-# $(2) = Base of flash region to write/wipe
-# $(3) = Size of flash region to write/wipe
-define JTAG_TEMPLATE_F2X
-# ---------------------------------------------------------------------------
-# Options for OpenOCD flash-programming
-# see openocd.pdf/openocd.texi for further information
-
-# if OpenOCD is in the $PATH just set OPENOCDEXE=openocd
-OOCD_EXE ?= openocd
-
-# debug level
-OOCD_JTAG_SETUP  = -d0
-# interface and board/target settings (using the OOCD target-library here)
-OOCD_JTAG_SETUP += -s $(TOP)/flight/Project/OpenOCD
-OOCD_JTAG_SETUP += -f foss-jtag.revb.cfg -f stm32f2x.cfg
-
-# initialize
-OOCD_BOARD_RESET = -c init
-# show the targets
-#OOCD_BOARD_RESET += -c targets
-# commands to prepare flash-write
-OOCD_BOARD_RESET += -c "reset halt"
-
-.PHONY: program
-program: $(1)
-	@echo $(MSG_JTAG_PROGRAM) $$(call toprel, $$<)
-	$(V1) $(OOCD_EXE) \
-		$$(OOCD_JTAG_SETUP) \
-		$$(OOCD_BOARD_RESET) \
-		-c "flash write_image erase $$< $(2) bin" \
-		-c "verify_image $$< $(2) bin" \
-		-c "reset run" \
-		-c "shutdown"
-
-.PHONY: wipe
-wipe:
-	@echo $(MSG_JTAG_WIPE) wiping $(3) bytes starting from $(2)
-	$(V1) $(OOCD_EXE) \
-		$$(OOCD_JTAG_SETUP) \
-		$$(OOCD_BOARD_RESET) \
-		-c "flash erase_address pad $(2) $(3)" \
-		-c "reset run" \
-		-c "shutdown"
-endef