From 0684a42fac5ecffb67db8069c1af8a5882edd6d4 Mon Sep 17 00:00:00 2001
From: Stacey Sheldon <stac@solidgoldbomb.org>
Date: Sat, 25 Feb 2012 12:35:29 -0500
Subject: [PATCH] build: use board-specific JTAG interface for openocd

Removes hard-coding of JTAG interface config in the
<board>_program make macros.

This allows the use of STLINKv2 for F4 boards while
continuing to use the FOSS JTAG revB on F1 boards.
---
 flight/Bootloaders/CopterControl/Makefile | 2 +-
 flight/Bootloaders/PipXtreme/Makefile     | 2 +-
 flight/Bootloaders/Revolution/Makefile    | 2 +-
 flight/CopterControl/Makefile             | 2 +-
 flight/PipXtreme/Makefile                 | 2 +-
 flight/Revolution/Makefile                | 2 +-
 make/boards/coptercontrol/board-info.mk   | 1 +
 make/boards/pipxtreme/board-info.mk       | 3 +++
 make/boards/revolution/board-info.mk      | 3 ++-
 make/firmware-defs.mk                     | 5 +++--
 10 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/flight/Bootloaders/CopterControl/Makefile b/flight/Bootloaders/CopterControl/Makefile
index b24d210da..d52541791 100644
--- a/flight/Bootloaders/CopterControl/Makefile
+++ b/flight/Bootloaders/CopterControl/Makefile
@@ -414,7 +414,7 @@ $(eval $(call PARTIAL_COMPILE_ARM_TEMPLATE, SRCARM))
 $(OUTDIR)/$(TARGET).bin.o: $(OUTDIR)/$(TARGET).bin
 
 # Add jtag targets (program and wipe)
-$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(BL_BANK_BASE),$(BL_BANK_SIZE),$(OPENOCD_CONFIG)))
+$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(BL_BANK_BASE),$(BL_BANK_SIZE),$(OPENOCD_JTAG_CONFIG),$(OPENOCD_CONFIG)))
 
 .PHONY: elf lss sym hex bin bino
 elf: $(OUTDIR)/$(TARGET).elf
diff --git a/flight/Bootloaders/PipXtreme/Makefile b/flight/Bootloaders/PipXtreme/Makefile
index 5a788e7e6..8711ccbd9 100644
--- a/flight/Bootloaders/PipXtreme/Makefile
+++ b/flight/Bootloaders/PipXtreme/Makefile
@@ -418,7 +418,7 @@ $(eval $(call PARTIAL_COMPILE_ARM_TEMPLATE, SRCARM))
 $(OUTDIR)/$(TARGET).bin.o: $(OUTDIR)/$(TARGET).bin
 
 # Add jtag targets (program and wipe)
-$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(BL_BANK_BASE),$(BL_BANK_SIZE),$(OPENOCD_CONFIG)))
+$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(BL_BANK_BASE),$(BL_BANK_SIZE),$(OPENOCD_JTAG_CONFIG),$(OPENOCD_CONFIG)))
 
 .PHONY: elf lss sym hex bin bino
 elf: $(OUTDIR)/$(TARGET).elf
diff --git a/flight/Bootloaders/Revolution/Makefile b/flight/Bootloaders/Revolution/Makefile
index b058a4c2c..be2ade0e3 100644
--- a/flight/Bootloaders/Revolution/Makefile
+++ b/flight/Bootloaders/Revolution/Makefile
@@ -328,7 +328,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,$(BL_BANK_BASE),$(BL_BANK_SIZE),$(OPENOCD_CONFIG)))
+$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(BL_BANK_BASE),$(BL_BANK_SIZE),$(OPENOCD_JTAG_CONFIG),$(OPENOCD_CONFIG)))
 
 .PHONY: elf lss sym hex bin bino
 elf: $(OUTDIR)/$(TARGET).elf
diff --git a/flight/CopterControl/Makefile b/flight/CopterControl/Makefile
index 71e487997..796d34e8d 100644
--- a/flight/CopterControl/Makefile
+++ b/flight/CopterControl/Makefile
@@ -583,7 +583,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),$(OPENOCD_CONFIG)))
+$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(FW_BANK_BASE),$(FW_BANK_SIZE),$(OPENOCD_JTAG_CONFIG),$(OPENOCD_CONFIG)))
 
 .PHONY: elf lss sym hex bin bino opfw
 elf: $(OUTDIR)/$(TARGET).elf
diff --git a/flight/PipXtreme/Makefile b/flight/PipXtreme/Makefile
index a21fdb74a..8c18afcbd 100644
--- a/flight/PipXtreme/Makefile
+++ b/flight/PipXtreme/Makefile
@@ -392,7 +392,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),$(OPENOCD_CONFIG)))
+$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(FW_BANK_BASE),$(FW_BANK_SIZE),$(OPENOCD_JTAG_CONFIG),$(OPENOCD_CONFIG)))
 
 .PHONY: elf lss sym hex bin bino opfw
 elf: $(OUTDIR)/$(TARGET).elf
diff --git a/flight/Revolution/Makefile b/flight/Revolution/Makefile
index 1545d7b33..f627b97d8 100644
--- a/flight/Revolution/Makefile
+++ b/flight/Revolution/Makefile
@@ -419,7 +419,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),$(OPENOCD_CONFIG)))
+$(eval $(call JTAG_TEMPLATE,$(OUTDIR)/$(TARGET).bin,$(FW_BANK_BASE),$(FW_BANK_SIZE),$(OPENOCD_JTAG_CONFIG),$(OPENOCD_CONFIG)))
 
 .PHONY: elf lss sym hex bin bino opfw
 elf: $(OUTDIR)/$(TARGET).elf
diff --git a/make/boards/coptercontrol/board-info.mk b/make/boards/coptercontrol/board-info.mk
index 7369ad788..dcad2f43e 100644
--- a/make/boards/coptercontrol/board-info.mk
+++ b/make/boards/coptercontrol/board-info.mk
@@ -9,6 +9,7 @@ BOARD               := STM32103CB_CC_Rev1
 MODEL               := MD
 MODEL_SUFFIX        := _CC
 
+OPENOCD_JTAG_CONFIG := foss-jtag.revb.cfg
 OPENOCD_CONFIG      := stm32f1x.cfg
 
 # Note: These must match the values in link_$(BOARD)_memory.ld
diff --git a/make/boards/pipxtreme/board-info.mk b/make/boards/pipxtreme/board-info.mk
index dbcb314df..19d05baf9 100644
--- a/make/boards/pipxtreme/board-info.mk
+++ b/make/boards/pipxtreme/board-info.mk
@@ -9,6 +9,9 @@ BOARD               := STM32103CB_PIPXTREME
 MODEL               := MD
 MODEL_SUFFIX        := 
 
+OPENOCD_JTAG_CONFIG := foss-jtag.revb.cfg
+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
diff --git a/make/boards/revolution/board-info.mk b/make/boards/revolution/board-info.mk
index b2e1002ea..ef1ce081f 100644
--- a/make/boards/revolution/board-info.mk
+++ b/make/boards/revolution/board-info.mk
@@ -9,7 +9,8 @@ BOARD               := STM32F4xx_OP
 MODEL               := HD
 MODEL_SUFFIX        := 
 
-OPENOCD_CONFIG      := stm32f4xx.cfg
+OPENOCD_JTAG_CONFIG := stlink-v2.cfg
+OPENOCD_CONFIG      := stm32f4xx.stlink.cfg
 
 # Note: These must match the values in link_$(BOARD)_memory.ld
 BL_BANK_BASE        := 0x08000000  # Start of bootloader flash
diff --git a/make/firmware-defs.mk b/make/firmware-defs.mk
index 2eb0a13d8..087792b45 100644
--- a/make/firmware-defs.mk
+++ b/make/firmware-defs.mk
@@ -203,7 +203,8 @@ 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
+# $(4) = OpenOCD JTAG interface configuration file to use
+# $(5) = OpenOCD configuration file to use
 define JTAG_TEMPLATE
 # ---------------------------------------------------------------------------
 # Options for OpenOCD flash-programming
@@ -216,7 +217,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 $(4)
+OOCD_JTAG_SETUP += -f $(4) -f $(5)
 
 # initialize
 OOCD_BOARD_RESET = -c init