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

diff --git a/bertos/rules.mk b/bertos/rules.mk
index fcf62f27..cce8ccba 100644
--- a/bertos/rules.mk
+++ b/bertos/rules.mk
@@ -121,7 +121,7 @@ endif
 ifneq ($$($(1)_CROSS),)
 	#deprecated: use PREFIX, SUFFIX and HOSTED mechanism instead
 	$(1)_PREFIX = $$($(1)_CROSS)
-	$(1)_SUFFIX = ""
+	$(1)_SUFFIX =
 endif
 
 $(1)_CC      ?= $$($(1)_PREFIX)$$(CC)$$($(1)_SUFFIX)
@@ -244,11 +244,10 @@ $$(OUTDIR)/$(1)_whole.elf: bumprev $$($(1)_SRC) $$($(1)_LDSCRIPT)
 # 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:$$< ; \
-	fi
-	#avarice --mkII -j usb --erase --program --verify --file images/triface.elf
+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)
 
 .PHONY: flash_$(1)_local
 flash_$(1)_local: