diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2012-05-19 17:07:21 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2012-05-19 17:07:21 +0000 |
| commit | 12891a785da0102fc0ba725677c631c42011d1eb (patch) | |
| tree | c26b80c506e6f4efc0cb97ac3cb774d3e4d9c550 | |
| parent | added udev rules examples to README (diff) | |
moved program to flash and set program to (erase, flash, run)
git-svn-id: https://svn.spreadspace.org/avr/trunk@16 aa12f405-d877-488e-9caf-2d797e2a1cc7
| -rw-r--r-- | blink/Makefile | 4 | ||||
| -rw-r--r-- | include.mk | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/blink/Makefile b/blink/Makefile index 9ac5f8b..d598f2f 100644 --- a/blink/Makefile +++ b/blink/Makefile @@ -22,8 +22,6 @@ NAME := blink
OBJ := blink.o led.o
-BOARD_TYPE := arduino2009
+BOARD_TYPE := teensy2
include ../include.mk
-
-#AVRDUDE_PORT := /dev/arduino
@@ -83,7 +83,7 @@ LDFLAGS += SRC := $(OBJ:%.o=%.c) -.PHONY: clean erase program reset run +.PHONY: clean program erase flash reset run ELFFILE := $(NAME).elf HEXFILE := $(NAME).hex @@ -122,7 +122,7 @@ define DFU/erase $(DFU) $(MCU) erase || true endef -define DFU/program +define DFU/flash $(DFU) $(MCU) flash $1 endef @@ -138,7 +138,7 @@ endef define teensy/erase endef -define teensy/program +define teensy/flash $(teensy) -mmcu=$(MCU) -w -v $1 endef @@ -153,7 +153,7 @@ define avrdude/erase $(avrdude) -V -F -p $(MCU) -P $(AVRDUDE_PORT) -c $(PROG_TYPE) -b $(UPLOAD_RATE) -e endef -define avrdude/program +define avrdude/flash $(avrdude) -V -F -p $(MCU) -P $(AVRDUDE_PORT) -c $(PROG_TYPE) -b $(UPLOAD_RATE) -D -U flash:w:$1 endef @@ -164,10 +164,12 @@ define avrdude/run endef ### Program Targets +program: erase flash run + erase: $(call $(PROG)/$@,) -program: $(HEXFILE) erase +flash: $(HEXFILE) $(call $(PROG)/$@,$(HEXFILE)) reset: |