X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=avr-makefile.inc;h=ae5a9ed6d03b38487b56441d2e1f70dd4cfd3a25;hp=0fe9e4f337870a35ee6b1f8137f4b76a0fd042f6;hb=d72d6fbe7abbd26958657c877bc0a3dbef8148ce;hpb=96ebafd201c9e8441c7677577b24aa402c1defc6

diff --git a/avr-makefile.inc b/avr-makefile.inc
index 0fe9e4f..ae5a9ed 100644
--- a/avr-makefile.inc
+++ b/avr-makefile.inc
@@ -1,23 +1,54 @@
 
-OBJ = $(SERPENT_OBJ)
-MCU_TARGET     = atmega644
-OPTIMIZE       = -Os
-DEFS           = -D$(call uc, $(MCU_TARGET))
-FLASHCMD       = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -c avr911 -U flash:w:# no space at the end
-
+MCU_TARGET     = atmega128
+F_CPU          = 14745600
+OPTIMIZE       = -Os # -Os
+EXTRALINK      = xram.o
+DEBUG          = -gdwarf-2
+WARNING        = -pedantic -Wall -Werror -Wstrict-prototypes
+PROGRAMMER     = jtagmkII
+PROG_PORT      = usb
+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) 
+RESETCMD       = avarice -2 -R -j usb
+DEP_DIR        = deps/
+TEST_DIR       = test/
+BIN_DIR        = bin/
+TESTSRC_DIR    = test_src/
 #uisp -dprog=bsd -dlpt=/dev/parport1 --upload if=$(PRG).hex
-ERASECMD       = 
-
-CC	     = avr-gcc
+ERASECMD       =
+TESTPORT       = /dev/ttyUSB0
+TESTPORTBAUDR  = 115200
+TESTLOG_DIR    = testlog/#
+TESTPREFIX     = nessie-
+SPEEDTOOL      = host/get_performance.rb
+SPEEDLOG_DIR   = speed_log/
+SPEEDPREFIX    =
+SPEEDCMD       = performance
+SIZE_DIR       = size_log/#
+LIST_DIR       = listings/#
+LIST_OPT       = -Wa,-adhln -g
+STAT_DIR       = stats/#
+AUTOASM_DIR    = autoasm/#
+AUTOASM_OPT    = -S
+CC	           = avr-gcc
+CSTD           = c99
 
-override CFLAGS	= -MMD -pedantic -std=c99 -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       = -Wl,-Map,
-override ASFLAGS	   = -mmcu=$(MCU_TARGET)
+override LDFLAGS       = -gdwarf-2 -Wl,--section-start,.data=0x801100,--defsym=__heap_end=0x807fff -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
+OBJCOPY         = avr-objcopy
+OBJDUMP         = avr-objdump
+SIZE            = avr-size
+READELF         = readelf
+RUBY            = ruby
+GET_TEST        = host/get_test.rb
+MAKE            = make
+MAKE2GRAPH      = ~/bin/make2graph.rb
+TWOPI           = twopi