diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | support/make/build-rules.mk | 2 | ||||
| -rw-r--r-- | support/openocd/debug_0.3.cfg (renamed from support/openocd/run.cfg) | 0 | ||||
| -rw-r--r-- | support/openocd/debug_0.4.cfg (renamed from support/openocd/run_0.4.0.cfg) | 0 | ||||
| -rw-r--r-- | support/openocd/flash_0.3.cfg (renamed from support/openocd/flash.cfg) | 0 | ||||
| -rw-r--r-- | support/openocd/flash_0.4.cfg (renamed from support/openocd/flash_0.4.0.cfg) | 0 |
6 files changed, 3 insertions, 3 deletions
@@ -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 diff --git a/support/make/build-rules.mk b/support/make/build-rules.mk index 4dcf00f..330cdd8 100644 --- a/support/make/build-rules.mk +++ b/support/make/build-rules.mk @@ -9,7 +9,7 @@ DISAS := arm-none-eabi-objdump OBJDUMP := arm-none-eabi-objdump SIZE := arm-none-eabi-size DFU := dfu-util -OPENOCD := openocd +OPENOCD_WRAPPER := support/scripts/openocd-wrapper.sh # Suppress annoying output unless V is set ifndef V diff --git a/support/openocd/run.cfg b/support/openocd/debug_0.3.cfg index 87d33ae..87d33ae 100644 --- a/support/openocd/run.cfg +++ b/support/openocd/debug_0.3.cfg diff --git a/support/openocd/run_0.4.0.cfg b/support/openocd/debug_0.4.cfg index bbc8864..bbc8864 100644 --- a/support/openocd/run_0.4.0.cfg +++ b/support/openocd/debug_0.4.cfg diff --git a/support/openocd/flash.cfg b/support/openocd/flash_0.3.cfg index 41c6532..41c6532 100644 --- a/support/openocd/flash.cfg +++ b/support/openocd/flash_0.3.cfg diff --git a/support/openocd/flash_0.4.0.cfg b/support/openocd/flash_0.4.cfg index e66d28d..e66d28d 100644 --- a/support/openocd/flash_0.4.0.cfg +++ b/support/openocd/flash_0.4.cfg |