From 14bbd09c8775de794a51c4735208bce0a33bda69 Mon Sep 17 00:00:00 2001
From: Brian Webb <webbbn@gmail.com>
Date: Wed, 16 May 2012 19:03:47 -0700
Subject: [PATCH] Reverted inadvertent checkin of firmware-defs.mk

---
 make/firmware-defs.mk | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/make/firmware-defs.mk b/make/firmware-defs.mk
index 594765444..b22a66639 100644
--- a/make/firmware-defs.mk
+++ b/make/firmware-defs.mk
@@ -116,7 +116,7 @@ FORCE:
 
 $(1).firmwareinfo.c: $(1) $(TOP)/make/templates/firmwareinfotemplate.c FORCE
 	@echo $(MSG_FWINFO) $$(call toprel, $$@)
-	python $(TOP)/make/scripts/version-info.py \
+	$(V1) python $(TOP)/make/scripts/version-info.py \
 		--path=$(TOP) \
 		--template=$(TOP)/make/templates/firmwareinfotemplate.c \
 		--outfile=$$@ \
@@ -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 flyswatter.cfg -f stm32f1x.cfg
+OOCD_JTAG_SETUP += -f foss-jtag.revb.cfg -f $(4)
 
 # initialize
 OOCD_BOARD_RESET = -c init
@@ -228,8 +229,8 @@ program: $(1)
 	$(V1) $(OOCD_EXE) \
 		$$(OOCD_JTAG_SETUP) \
 		$$(OOCD_BOARD_RESET) \
-		-c "flash write_image erase $(subst c:,,$(1)) $(2) bin" \
-		-c "verify_image $(subst c:,,$(1)) $(2) bin" \
+		-c "flash write_image erase $$< $(2) bin" \
+		-c "verify_image $$< $(2) bin" \
 		-c "reset run" \
 		-c "shutdown"
 
@@ -242,4 +243,5 @@ wipe:
 		-c "flash erase_address pad $(2) $(3)" \
 		-c "reset run" \
 		-c "shutdown"
-endef
\ No newline at end of file
+endef
+