Merge pull request #294 from USC-ACTLab/bugfixMakeFlash

Improved debugger support
bitcraze · Feb 12, 2018 · ead57a1 · ead57a1
2 parents 63b6b49 + e583c7d
commit ead57a1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -346,7 +346,13 @@ endif
 #Flash the stm.
 flash:
 	$(OPENOCD) -d2 -f $(OPENOCD_INTERFACE) $(OPENOCD_CMDS) -f $(OPENOCD_TARGET) -c init -c targets -c "reset halt" \
-                 -c "flash write_image erase $(PROG).elf" -c "verify_image $(PROG).elf" -c "reset run" -c shutdown
+                 -c "flash write_image erase $(PROG).bin $(LOAD_ADDRESS) bin" \
+                 -c "verify_image $(PROG).bin $(LOAD_ADDRESS) bin" -c "reset run" -c shutdown
+
+#verify only
+flash_verify:
+	$(OPENOCD) -d2 -f $(OPENOCD_INTERFACE) $(OPENOCD_CMDS) -f $(OPENOCD_TARGET) -c init -c targets -c "reset halt" \
+                 -c "verify_image $(PROG).bin $(LOAD_ADDRESS) bin" -c "reset run" -c shutdown
 
 flash_dfu:
 	$(DFU_UTIL) -a 0 -D $(PROG).dfu

diff --git a/tools/make/config.mk.example b/tools/make/config.mk.example
@@ -31,3 +31,8 @@
 
 ## Compile positioning system for TDoA mode
 # LPS_TDOA_ENABLE=1
+
+## Use J-Link as Debugger/flasher
+# OPENOCD_INTERFACE ?= interface/jlink.cfg
+# OPENOCD_TARGET    ?= target/stm32f4x.cfg
+# OPENOCD_CMDS      ?= -c "transport select swd"