X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=avr-makefile.inc;h=39b10f8f1cf9bebb24f21d82cae7b6f3e1178e09;hb=9023000e91b6065961051339700526c98f8438e8;hp=4396b24800e543cd1f3bb696baa0567b3444ea93;hpb=b246a2a0589f234db6247255555df98f4c281c41;p=avr-crypto-lib.git

diff --git a/avr-makefile.inc b/avr-makefile.inc
index 4396b24..39b10f8 100644
--- a/avr-makefile.inc
+++ b/avr-makefile.inc
@@ -1,22 +1,23 @@
 
-MCU_TARGET     = atmega644
-F_CPU          = 20000000
+MCU_TARGET     = atmega128
+F_CPU          = 14745600
 OPTIMIZE       = -Os # -Os
 DEBUG          = -gdwarf-2
-WARNING        = -pedantic -Wall -Wstrict-prototypes
-PROGRAMMER     = avr911
-PROG_PORT      = /dev/ttyUSB0
+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       = 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       =
-TESTPORT       = /dev/ttyUSB1
+TESTPORT       = /dev/ttyUSB0
 TESTPORTBAUDR  = 115200
 TESTLOG_DIR    = testlog/#
 TESTPREFIX     = nessie-
@@ -26,16 +27,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))) $(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,-Map,#
 override ASFLAGS	   = -mmcu=$(MCU_TARGET) -Wa,--gdwarf-2
 
 SIZESTAT_FILE = sizestats.txt