X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=avr-makefile.inc;h=323786abf3024a9fa7ceb4ff3fd68a8fd218ca35;hb=cccb1d3e008592ad7e4b57653afb95deb4d4a2c5;hp=dfc3474f8f695666b4b1d0dfb9ef0be8a25ba3a0;hpb=9e7453525f32441ea49ef1d9b3248e94d9554eec;p=avr-crypto-lib.git

diff --git a/avr-makefile.inc b/avr-makefile.inc
index dfc3474..323786a 100644
--- a/avr-makefile.inc
+++ b/avr-makefile.inc
@@ -1,20 +1,43 @@
 
-OBJ = $(SERPENT_OBJ)
 MCU_TARGET     = atmega644
 OPTIMIZE       = -Os
-DEFS           = -DATMEGA644
-FLASHCMD       = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -c avr911 -U flash:w:$(PRG).hex
-#  -U eeprom:w:$(PRG)_eeprom.hex
+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
+#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/
+TESTSRC_DIR    = test_src/
 #uisp -dprog=bsd -dlpt=/dev/parport1 --upload if=$(PRG).hex
 ERASECMD       = 
+TESTPORT       = /dev/ttyUSB1
+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
 
-CC	     = avr-gcc
+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 CFLAGS	= -pedantic -std=c99 -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override LDFLAGS       = -gdwarf-2 -Wl,-Map,
+override ASFLAGS	   = -mmcu=$(MCU_TARGET) -Wa,--gdwarf-2
 
-override LDFLAGS       = -Wl,-Map,
-override ASFLAGS	   = -mmcu=$(MCU_TARGET)
+SIZESTAT_FILE = sizestats.txt
 
-OBJCOPY	= avr-objcopy
-OBJDUMP	= avr-objdump
-SIZE = avr-size
+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