From: (no author) <(no author)@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Thu, 27 Aug 2009 12:58:43 +0000 (+0000)
Subject: Refactor in order to have an interface for each project; Add programmer info help.
X-Git-Tag: 2.2.0~174
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=18c5f92e969edd499f2c41110984a131fa9693f3;p=bertos.git

Refactor in order to have an interface for each project; Add programmer info help.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2794 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/bertos/config.mk b/bertos/config.mk
index 845083f9..752313a3 100644
--- a/bertos/config.mk
+++ b/bertos/config.mk
@@ -10,7 +10,6 @@
 #
 # Programmer type
 # see local pgm_config.mk for programmer customization.
--include pgm_config.mk
 
 OPTCFLAGS = -ffunction-sections -fdata-sections
 #OPTCFLAGS = -funsafe-loop-optimizations
diff --git a/bertos/rules.mk b/bertos/rules.mk
index cce8ccba..a6dae1df 100644
--- a/bertos/rules.mk
+++ b/bertos/rules.mk
@@ -245,9 +245,15 @@ $$(OUTDIR)/$(1)_whole.elf: bumprev $$($(1)_SRC) $$($(1)_LDSCRIPT)
 # 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 [ ! "$$($(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: