From d9f2a93159df96eef0d8084b96df7268533177ff Mon Sep 17 00:00:00 2001 From: Perry Hung Date: Thu, 26 May 2011 20:13:09 -0400 Subject: openocd: Detect openocd version Small script to detect the openocd version and choose the appropriate debug/flash script for use with JTAG debugging. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d0cead4..e2b59b4 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,7 @@ UPLOAD_ram := $(SUPPORT_PATH)/scripts/reset.py && \ UPLOAD_flash := $(SUPPORT_PATH)/scripts/reset.py && \ sleep 1 && \ $(DFU) -a1 -d $(VENDOR_ID):$(PRODUCT_ID) -D $(BUILD_PATH)/$(BOARD).bin -R -UPLOAD_jtag := $(OPENOCD) -f support/openocd/flash.cfg +UPLOAD_jtag := $(OPENOCD_WRAPPER) flash # conditionally upload to whatever the last build was install: INSTALL_TARGET = $(shell cat $(BUILD_PATH)/build-type 2>/dev/null) @@ -149,7 +149,7 @@ help: @echo " " debug: - $(OPENOCD) -f support/openocd/run.cfg + $(OPENOCD_WRAPPER) debug cscope: rm -rf *.cscope -- cgit v1.2.3