aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-08-20 13:35:59 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-08-20 13:35:59 +0200
commit0f3a959b2f0bb78b12e404230d4a7a3db79e03e4 (patch)
treef7b82026570a1416ad1953f1334d9b890424584f
parent11832cc3432423747b41dd58af0b9cbc09ae48ad (diff)
...
-rw-r--r--amforth-6.5/appl/template/makefile7
-rw-r--r--amforth-6.5/appl/template/template.asm2
2 files changed, 5 insertions, 4 deletions
diff --git a/amforth-6.5/appl/template/makefile b/amforth-6.5/appl/template/makefile
index 33142ee..22ba346 100644
--- a/amforth-6.5/appl/template/makefile
+++ b/amforth-6.5/appl/template/makefile
@@ -15,7 +15,7 @@ TARGET=template
AMFORTH=../..
# the MCU should be identical to the device
-MCU=atmega1284p
+MCU=atmega328p
# set the fuses according to your MCU
LFUSE=0xnn
HFUSE=0xnn
@@ -36,7 +36,8 @@ BURNER=$(USB)
AVRDUDE=avrdude
AVRDUDE_FLAGS=-q $(BURNER) -p $(MCU)
-AVRASM=wine $(DIR_ATMEL)/avrasm2.exe -I $(DIR_ATMEL)/Appnotes2
+#AVRASM=wine $(DIR_ATMEL)/avrasm2.exe -I $(DIR_ATMEL)/Appnotes2
+AVRASM=avra -I $(DIR_ATMEL)/Appnotes2
# ----------------------------------------------------------
@@ -55,7 +56,7 @@ $(TARGET).hex: $(TARGET).asm words/*.asm $(AMFORTH)/common/words/*.asm $(AMFORTH
TSTAMPLEN=$${#TSTAMP}; \
echo "($$TSTAMPLEN) $$TSTAMP"; \
sed -e "s/@TSTAMPLEN@/$$TSTAMPLEN/g" -e "s/@TSTAMP@/$$TSTAMP/g" $(AMFORTH)/common/words/build-info.tmpl > words/build-info.asm )
- $(AVRASM) $(INCLUDE) -fI -v0 -e $(TARGET).eep.hex -l $(TARGET).lst $(TARGET).asm
+ $(AVRASM) $(INCLUDE) -fI -e $(TARGET).eep.hex -l $(TARGET).lst $(TARGET).asm
$(TARGET).back:
$(AVRDUDE) $(AVRDUDE_FLAGS) -U flash:r:$(TARGET).hex:i -U eeprom:r:$(TARGET).eep.hex:i
diff --git a/amforth-6.5/appl/template/template.asm b/amforth-6.5/appl/template/template.asm
index 95a82e3..53de860 100644
--- a/amforth-6.5/appl/template/template.asm
+++ b/amforth-6.5/appl/template/template.asm
@@ -35,7 +35,7 @@
; amforth needs two essential parameters: CPU clock
; and command terminal line.
; cpu clock in hertz, 1MHz is factory default
-.equ F_CPU = 8000000
+.equ F_CPU = 20000000
; terminal settings
; check http://amforth.sourceforge.net/TG/recipes/Usart.html