X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Frules.mk;h=11f8aebbbc80ff07fb1aa8ed5cc8e1e8d13436b4;hb=be47a5d85bf0bb7903e47423f6da0007f24060ed;hp=cce8ccba9dc3d01b3bea6eede3648343dea6cc86;hpb=388f7931a07e3bf406978bdf788d34e86f33bf53;p=bertos.git

diff --git a/bertos/rules.mk b/bertos/rules.mk
index cce8ccba..11f8aebb 100644
--- a/bertos/rules.mk
+++ b/bertos/rules.mk
@@ -242,16 +242,43 @@ $$(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).hex flash_$(1)_local
-	PROGRAMMER_CPU=$$($(1)_PROGRAMMER_CPU) PROGRAMMER_TYPE=$(PROGRAMMER_TYPE) \
-	PROGRAMMER_PORT=$(PROGRAMMER_PORT) IMAGE_FILE=$$< \
-	$$($(1)_FLASH_SCRIPT)
+	$L "$(1): Flashing target"
+	$Q if [ ! -f $$($(1)_FLASH_SCRIPT) ] ; then \
+		printf "No flash script found.\n" ; \
+		exit 1 ; \
+	fi
+	$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 
 
 .PHONY: flash_$(1)_local
 flash_$(1)_local:
 
+# Debug target
+.PHONY: debug_$(1)
+debug_$(1): $(OUTDIR)/$(1).elf
+	$L "$(1): Debugging target"
+	$Q if [ ! -f $$($(1)_DEBUG_SCRIPT) ] ; then \
+		printf "No debug script found.\n" ; \
+		exit 1 ; \
+	fi
+	$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 \