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

diff --git a/avr-makefile.inc b/avr-makefile.inc
index f656cd3..ae5a9ed 100644
--- a/avr-makefile.inc
+++ b/avr-makefile.inc
@@ -1,19 +1,25 @@
 
-MCU_TARGET     = atmega644
+MCU_TARGET     = atmega128
+F_CPU          = 14745600
 OPTIMIZE       = -Os # -Os
-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
+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/
-TESTBIN_DIR    = test_bin/
 TESTSRC_DIR    = test_src/
 #uisp -dprog=bsd -dlpt=/dev/parport1 --upload if=$(PRG).hex
 ERASECMD       =
-TESTPORT       = /dev/ttyUSB1
-TESTPORTBAUDR  = 38400
+TESTPORT       = /dev/ttyUSB0
+TESTPORTBAUDR  = 115200
 TESTLOG_DIR    = testlog/#
 TESTPREFIX     = nessie-
 SPEEDTOOL      = host/get_performance.rb
@@ -22,16 +28,17 @@ 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
+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 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