X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=avr-makefile.inc;h=9de0323c1c1103788444fbac6dec889cc30be083;hb=35dc9566e40c9f68fa216c70eaa6d5b0597448fe;hp=bb39deb0d0c9abcceabd916537c232a248d39701;hpb=302f07c97444e2f5f5560dc2fd9af58d4b591d45;p=avr-crypto-lib.git

diff --git a/avr-makefile.inc b/avr-makefile.inc
index bb39deb..9de0323 100644
--- a/avr-makefile.inc
+++ b/avr-makefile.inc
@@ -1,32 +1,37 @@
 
 MCU_TARGET     = atmega644
 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
 #FLASHCMD       = avrdude -p $(MCU_TARGET) -c usbasp -U flash:w:# no space at the end
+RESETCMD       = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -c $(PROGRAMMER) 
 DEP_DIR        = deps/
 TEST_DIR       = test/
 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/
+TESTPORTBAUDR  = 115200
+TESTLOG_DIR    = testlog/#
 TESTPREFIX     = nessie-
+SPEEDTOOL      = host/get_performance.rb
 SPEEDLOG_DIR   = speed_log/
 SPEEDPREFIX    =
-LIST_DIR       = listings/
-STAT_DIR       = stats/
-AUTOASM_DIR    = autoasm/
+SPEEDCMD       = performance
+SIZE_DIR       = size_log/#
+LIST_DIR       = listings/#
+STAT_DIR       = stats/#
+AUTOASM_DIR    = autoasm/#
 AUTOASM_OPT    = -S
 CC	       = avr-gcc
 CSTD           = c99
 
-override CFLAGS_A	= -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $(1))) -I. -Itest_src -gdwarf-2 -pedantic -std=$(CSTD) -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
-override CFLAGS 	= -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $@)) -I. -Itest_src -gdwarf-2 -pedantic -std=$(CSTD) -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override CFLAGS_A	= -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $(1))) $(DEBUG) $(WARNING) -std=$(CSTD) $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override CFLAGS 	= -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $@))   $(DEBUG) $(WARNING) -std=$(CSTD) $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
 
 override LDFLAGS       = -gdwarf-2 -Wl,-Map,
 override ASFLAGS	   = -mmcu=$(MCU_TARGET) -Wa,--gdwarf-2
@@ -39,7 +44,6 @@ 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