X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=avr-makefile.inc;h=d44ca11ee4cf29adf67c5adf95a4e26422710c6c;hb=206e5aa6d34ac3fb32bdf9e6affc153547e189d8;hp=ac8e64762c6417a66cc2d709a172da802f0b40b4;hpb=6bd58d7909b89a3e05003a63cdc642638fa653e6;p=avr-crypto-lib.git

diff --git a/avr-makefile.inc b/avr-makefile.inc
index ac8e647..d44ca11 100644
--- a/avr-makefile.inc
+++ b/avr-makefile.inc
@@ -1,9 +1,10 @@
 
-OBJ = $(SERPENT_OBJ)
 MCU_TARGET     = atmega644
 OPTIMIZE       = -Os
+PROGRAMMER     = stk500v2 # avr911
 DEFS           = -D$(call uc, $(MCU_TARGET))
-FLASHCMD       = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -c avr911 -U flash:w:# no space at the end
+FLASHCMD       = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -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
 DEP_DIR        = deps/
 BIN_DIR        = bin/
 TESTBIN_DIR    = test_bin/
@@ -11,21 +12,32 @@ TESTSRC_DIR    = test_src/
 #uisp -dprog=bsd -dlpt=/dev/parport1 --upload if=$(PRG).hex
 ERASECMD       = 
 TESTPORT       = /dev/ttyUSB1
-TESTPORTBAUDR  = 9600
+TESTPORTBAUDR  = 38400
 TESTLOG_DIR    = testlog/
 TESTPREFIX     = nessie-
+SPEEDLOG_DIR   = speed_log/
+SPEEDPREFIX    =
 LIST_DIR       = listings/
 STAT_DIR       = stats/
+AUTOASM_DIR    = autoasm/
+AUTOASM_OPT    = -S
 CC	       = avr-gcc
+CSTD           = c99
 
-override CFLAGS	= -MMD -MF$(DEP_DIR)$(patsubst %.c,%.d,$(patsubst $(TESTSRC_DIR)%,%,$<)) -I. -gdwarf-2 -pedantic -std=c99 -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override CFLAGS	= -MMD -MF$(DEP_DIR)$(patsubst %.c,%.d,$(patsubst $(TESTSRC_DIR)%,%,$<)) -I. -Itest_src -gdwarf-2 -pedantic -std=$(CSTD) -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
 
 override LDFLAGS       = -gdwarf-2 -Wl,-Map,
-override ASFLAGS	   = -mmcu=$(MCU_TARGET) -gdwarf-2
+override ASFLAGS	   = -mmcu=$(MCU_TARGET) -Wa,--gdwarf-2
 
 SIZESTAT_FILE = sizestats.txt
 
-OBJCOPY	= avr-objcopy
-OBJDUMP	= avr-objdump
-SIZE = avr-size
-RUBY = ruby
+OBJCOPY         = avr-objcopy
+OBJDUMP         = avr-objdump
+SIZE            = avr-size
+READELF         = readelf
+RUBY            = ruby
+GET_TEST        = host/get_test.rb
+GET_PERFORMANCE = host/get_performance.rb
+MAKE            = make
+MAKE2GRAPH      = ~/bin/make2graph.rb
+TWOPI           = twopi