backporting uart_i and cli

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

diff --git a/avr-makefile.inc b/avr-makefile.inc
index d40f6c76258ccf01bb501b999091938da5e27033..323786abf3024a9fa7ceb4ff3fd68a8fd218ca35 100644 (file)
--- a/avr-makefile.inc
+++ b/avr-makefile.inc
@@ -1,8 +1,9 @@
 
 MCU_TARGET     = atmega644
 OPTIMIZE       = -Os
+PROGRAMMER     = 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/
@@ -14,22 +15,29 @@ 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
 
-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) -Wa,--gdwarf-2
 
 SIZESTAT_FILE = sizestats.txt
 
-OBJCOPY        = avr-objcopy
-OBJDUMP        = avr-objdump
-SIZE = avr-size
-RUBY = ruby
-GET_TEST = host/get_test.rb
-MAKE = make
-MAKE2GRAPH = ~/bin/make2graph.rb
-TWOPI = twopi
+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