summaryrefslogtreecommitdiff
path: root/software
diff options
context:
space:
mode:
authorChristian Pointner <equinox@mur.at>2012-05-20 03:05:40 +0000
committerChristian Pointner <equinox@mur.at>2012-05-20 03:05:40 +0000
commitbb1db17554767dfd34d4a5661e68c2c229301cd3 (patch)
treef6c722afa124a428400ed05118992519f3e66cb2 /software
parentfixed reset to bootloader?? (diff)
added avr.include.mk with reset capability
git-svn-id: https://svn.spreadspace.org/mur.sat@452 7de4ea59-55d0-425e-a1af-a3118ea81d4c
Diffstat (limited to 'software')
-rw-r--r--software/avr.include.mk18
1 files changed, 4 insertions, 14 deletions
diff --git a/software/avr.include.mk b/software/avr.include.mk
index 3c1496d..ca126b4 100644
--- a/software/avr.include.mk
+++ b/software/avr.include.mk
@@ -126,10 +126,6 @@ define DFU/flash
$(DFU) $(MCU) flash $1
endef
-define DFU/reset
- $(DFU) $(MCU) reset
-endef
-
define DFU/run
$(DFU) $(MCU) start
endef
@@ -142,9 +138,6 @@ define teensy/flash
$(teensy) -mmcu=$(MCU) -w -v $1
endef
-define teensy/reset
-endef
-
define teensy/run
endef
@@ -157,14 +150,11 @@ define avrdude/flash
$(avrdude) -V -F -p $(MCU) -P $(AVRDUDE_PORT) -c $(PROG_TYPE) -b $(UPLOAD_RATE) -D -U flash:w:$1
endef
-define avrdude/reset
-endef
-
define avrdude/run
endef
### Program Targets
-program: erase flash run
+program: reset erase flash run
erase:
$(call $(PROG)/$@,)
@@ -172,8 +162,8 @@ erase:
flash: $(HEXFILE)
$(call $(PROG)/$@,$(HEXFILE))
-reset:
- $(call $(PROG)/$@,)
-
run:
$(call $(PROG)/$@,)
+
+reset:
+ @$(RESET_FUNC)