upgraded svn

[avr-crypto-lib.git] / avr-makefile.inc

diff --git a/avr-makefile.inc b/avr-makefile.inc
index 3bd0a3f9c5607ce2b1127ba926178fea1bc3ce4f..4396b24800e543cd1f3bb696baa0567b3444ea93 100644 (file)
--- a/avr-makefile.inc
+++ b/avr-makefile.inc
@@ -1,12 +1,15 @@
 
 MCU_TARGET     = atmega644
+F_CPU          = 20000000
 OPTIMIZE       = -Os # -Os
 DEBUG          = -gdwarf-2
 WARNING        = -pedantic -Wall -Wstrict-prototypes
 PROGRAMMER     = avr911
-DEFS           = -D$(call uc, $(MCU_TARGET))
-FLASHCMD       = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -c $(PROGRAMMER) -U flash:w:# no space at the end
+PROG_PORT      = /dev/ttyUSB0
+DEFS           = -D$(call uc, $(MCU_TARGET)) -DF_CPU=$(F_CPU)
+FLASHCMD       = avrdude -p $(MCU_TARGET) -P $(PROG_PORT) -c $(PROGRAMMER) -U flash:w:# no space at the end
 #FLASHCMD       = avrdude -p $(MCU_TARGET) -c usbasp -U flash:w:# no space at the end
+RESETCMD       = avrdude -p $(MCU_TARGET) -P $(PROG_PORT) -c $(PROGRAMMER) 
 DEP_DIR        = deps/
 TEST_DIR       = test/
 BIN_DIR        = bin/
@@ -14,7 +17,7 @@ TESTSRC_DIR    = test_src/
 #uisp -dprog=bsd -dlpt=/dev/parport1 --upload if=$(PRG).hex
 ERASECMD       =
 TESTPORT       = /dev/ttyUSB1
-TESTPORTBAUDR  = 38400
+TESTPORTBAUDR  = 115200
 TESTLOG_DIR    = testlog/#
 TESTPREFIX     = nessie-
 SPEEDTOOL      = host/get_performance.rb