X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Frules.mk;h=f3171792be7097a146209ef7fb344e94870f64e2;hb=d82169c5d84ea8b5b81e4625dea7b838dffb777e;hp=6096accf67c2ad26f4506dd1673527166a1c5e13;hpb=4566bef0b064c05231dd0291c3b4cbbd5c1dfdfd;p=bertos.git

diff --git a/bertos/rules.mk b/bertos/rules.mk
index 6096accf..f3171792 100644
--- a/bertos/rules.mk
+++ b/bertos/rules.mk
@@ -242,17 +242,35 @@ $$(OUTDIR)/$(1)_whole.elf: bumprev $$($(1)_SRC) $$($(1)_LDSCRIPT)
 	$Q $$($(1)_CC) $$($(1)_SRC) $$(CFLAGS) $$($(1)_CFLAGS) $$(LIB) $$(LDFLAGS) $$($(1)_LDFLAGS) -o $$@
 
 # Flash target
-# NOTE: we retry in case of failure because the STK500 programmer is crappy
 .PHONY: flash_$(1)
-flash_$(1): $(OUTDIR)/$(1).s19 flash_$(1)_local
-	if ! $(AVRDUDE) $(DPROG) -p $$($(1)_MCU) -U flash:w:$$< ; then \
-	     $(AVRDUDE) $(DPROG) -p $$($(1)_MCU) -U flash:w:$$< ; \
+flash_$(1): $(OUTDIR)/$(1).hex flash_$(1)_local
+	$L "$(1): Flashing target"
+	$Q if [ ! "$$($(1)_PROGRAMMER_TYPE)" == "none" ] ; then \
+		PROGRAMMER_CPU=$$($(1)_PROGRAMMER_CPU) PROGRAMMER_TYPE=$$($(1)_PROGRAMMER_TYPE) \
+		PROGRAMMER_PORT=$$($(1)_PROGRAMMER_PORT) IMAGE_FILE=$$< \
+		$$($(1)_FLASH_SCRIPT) ; \
+	else \
+		printf "No programmer interface configured, see http://dev.bertos.org/wiki/ProgrammerInterface\n" ; \
+		exit 1 ; \
 	fi
-	#avarice --mkII -j usb --erase --program --verify --file images/triface.elf
 
 .PHONY: flash_$(1)_local
 flash_$(1)_local:
 
+# Debug target
+.PHONY: debug_$(1)
+debug_$(1): $(OUTDIR)/$(1).elf
+	$L "$(1): Debugging target"
+	$Q if [ ! "$$($(1)_PROGRAMMER_TYPE)" == "none" ] ; then \
+		PROGRAMMER_CPU=$$($(1)_PROGRAMMER_CPU) PROGRAMMER_TYPE=$$($(1)_PROGRAMMER_TYPE) \
+		PROGRAMMER_PORT=$$($(1)_PROGRAMMER_PORT) GDB_PORT=3333 \
+		ELF_FILE=$$< \
+		$$($(1)_DEBUG_SCRIPT) ; \
+	else \
+		printf "No programmer interface configured, see http://dev.bertos.org/wiki/ProgrammerInterface\n" ; \
+		exit 1 ; \
+	fi
+
 .PHONY: fuses_$(!)
 fuses_$(1):
 	if [ ! -z "$$($(1)_efuse)" ] ; then \