diff options
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | contrib/openocd/debug_0.3.cfg (renamed from support/openocd/debug_0.3.cfg) | 0 | ||||
| -rw-r--r-- | contrib/openocd/debug_0.4.cfg (renamed from support/openocd/debug_0.4.cfg) | 0 | ||||
| -rw-r--r-- | contrib/openocd/flash_0.3.cfg (renamed from support/openocd/flash_0.3.cfg) | 0 | ||||
| -rw-r--r-- | contrib/openocd/flash_0.4.cfg (renamed from support/openocd/flash_0.4.cfg) | 0 | ||||
| -rwxr-xr-x | contrib/openocd/openocd-wrapper.sh (renamed from support/scripts/openocd-wrapper.sh) | 0 | ||||
| -rw-r--r-- | support/make/build-rules.mk | 1 |
7 files changed, 1 insertions, 7 deletions
@@ -93,7 +93,7 @@ $(foreach m,$(LIBMAPLE_MODULES),$(eval $(call LIBMAPLE_MODULE_template,$(m)))) # main target include $(SRCROOT)/build-targets.mk -.PHONY: install sketch clean help debug cscope tags ctags ram flash jtag doxygen mrproper list-boards +.PHONY: install sketch clean help cscope tags ctags ram flash jtag doxygen mrproper list-boards # Target upload commands # USB ID for DFU upload -- FIXME: do something smarter with this @@ -105,7 +105,6 @@ UPLOAD_ram := $(SUPPORT_PATH)/scripts/reset.py && \ UPLOAD_flash := $(SUPPORT_PATH)/scripts/reset.py && \ sleep 1 && \ $(DFU) -a1 -d $(BOARD_USB_VENDOR_ID):$(BOARD_USB_PRODUCT_ID) -D $(BUILD_PATH)/$(BOARD).bin -R -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) @@ -150,16 +149,12 @@ help: @echo " jtag: Compile for JTAG/SWD upload (overwrites bootloader)" @echo "" @echo "Other targets:" - @echo " debug: Start OpenOCD gdb server on port 3333, telnet on port 4444" @echo " clean: Remove all build and object files" @echo " help: Show this message" @echo " doxygen: Build Doxygen HTML and XML documentation" @echo " mrproper: Remove all generated files" @echo "" -debug: - $(OPENOCD_WRAPPER) debug - cscope: rm -rf *.cscope find . -name '*.[hcS]' -o -name '*.cpp' | xargs cscope -b diff --git a/support/openocd/debug_0.3.cfg b/contrib/openocd/debug_0.3.cfg index 87d33ae..87d33ae 100644 --- a/support/openocd/debug_0.3.cfg +++ b/contrib/openocd/debug_0.3.cfg diff --git a/support/openocd/debug_0.4.cfg b/contrib/openocd/debug_0.4.cfg index 7d6982a..7d6982a 100644 --- a/support/openocd/debug_0.4.cfg +++ b/contrib/openocd/debug_0.4.cfg diff --git a/support/openocd/flash_0.3.cfg b/contrib/openocd/flash_0.3.cfg index 41c6532..41c6532 100644 --- a/support/openocd/flash_0.3.cfg +++ b/contrib/openocd/flash_0.3.cfg diff --git a/support/openocd/flash_0.4.cfg b/contrib/openocd/flash_0.4.cfg index 32c06c6..32c06c6 100644 --- a/support/openocd/flash_0.4.cfg +++ b/contrib/openocd/flash_0.4.cfg diff --git a/support/scripts/openocd-wrapper.sh b/contrib/openocd/openocd-wrapper.sh index 73be92e..73be92e 100755 --- a/support/scripts/openocd-wrapper.sh +++ b/contrib/openocd/openocd-wrapper.sh diff --git a/support/make/build-rules.mk b/support/make/build-rules.mk index 330cdd8..3d541ba 100644 --- a/support/make/build-rules.mk +++ b/support/make/build-rules.mk @@ -9,7 +9,6 @@ DISAS := arm-none-eabi-objdump OBJDUMP := arm-none-eabi-objdump SIZE := arm-none-eabi-size DFU := dfu-util -OPENOCD_WRAPPER := support/scripts/openocd-wrapper.sh # Suppress annoying output unless V is set ifndef V |