rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00
Code Issues Releases Activity

makefile: fix clobbered JTAG macro in firmware-defs.mk

Browse Source 
JTAG rules got clobbered at some point.  This should
fix:
   make fw_coptercontrol_program
and others like it.
This commit is contained in:
Stacey Sheldon 2012-08-11 22:28:43 -04:00
parent bbe86332de
commit 4d73c1e2c2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
make/firmware-defs.mk
View File

@ -210,7 +210,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
@ -223,7 +224,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