X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=examples%2Ftriface%2Ftriface.mk;h=7f3947245946c1a54f3798efafebb513094b801d;hb=ca408eeff468a18d16fc1c8f4b29df6d44ae0293;hp=871f02d07d1dc00ed86eb05bb9ce376b6dab22ef;hpb=24c21c92d29b76a3f0de0a107f4bafef7bb0f812;p=bertos.git

diff --git a/examples/triface/triface.mk b/examples/triface/triface.mk
index 871f02d0..7f394724 100644
--- a/examples/triface/triface.mk
+++ b/examples/triface/triface.mk
@@ -14,11 +14,25 @@ triface_DEBUG = 1
 
 # Our target application
 TRG += triface
+CPU = atmega1281
+BOOT_ADDR_START = 0x1E000
 
+triface_PREFIX = avr-
+
+ifeq ($(CPU), atmega1281)
+triface_hfuse = 0x98
+triface_lfuse = 0x3d
+triface_efuse = 0x7f
+triface_lock = 0x2f
+else
 triface_hfuse = 0x88
 triface_lfuse = 0xff
 triface_efuse = 0xff
 triface_lock = 0x2f
+endif
+
+triface_MCU = $(CPU)
+
 triface_CSRC = \
 	examples/triface/triface.c \
 	examples/triface/protocol.c \
@@ -26,8 +40,8 @@ triface_CSRC = \
 	bertos/drv/timer.c \
 	bertos/drv/ser.c \
 	bertos/drv/buzzer.c \
+	bertos/drv/sipo.c \
 	bertos/cpu/avr/drv/ser_avr.c \
-	bertos/cpu/avr/drv/sipo.c \
 	bertos/mware/formatwr.c \
 	bertos/mware/hex.c \
 	bertos/struct/hashtable.c \
@@ -41,11 +55,9 @@ triface_CSRC = \
 triface_PCSRC += bertos/mware/formatwr.c
 
 
-triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -fno-strict-aliasing -Iexamples/triface -Ibertos/cpu/avr
+triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -D'CPU_FREQ=(14745600UL)' -fno-strict-aliasing -Iexamples/triface -Ibertos/cpu/avr
 triface_LDFLAGS = -Wl
 
-triface_MCU = atmega64
-triface_CROSS = avr-
 
 # Set to 1 for debug builds
 boot_DEBUG = 0
@@ -53,7 +65,7 @@ boot_DEBUG = 0
 # Our target application
 TRG += boot
 
-boot_MCU = atmega64
+boot_MCU = $(CPU)
 boot_CSRC = \
 	examples/triface/boot/main.c \
 	bertos/net/xmodem.c \
@@ -65,8 +77,9 @@ boot_CSRC = \
 	bertos/mware/hex.c \
 	bertos/kern/kfile.c \
 	#
-boot_CROSS = avr-
-boot_CPPFLAGS = -D'ARCH=(ARCH_TRIFACE|ARCH_BOOT)' -Iexamples/triface/boot -Ibertos/cpu/avr
+boot_PREFIX = avr-
+boot_CPPFLAGS = -D'ARCH=(ARCH_TRIFACE|ARCH_BOOT)' -D'CPU_FREQ=(14745600UL)' -Iexamples/triface/boot -Ibertos/cpu/avr
 boot_CFLAGS = -Os -mcall-prologues
-boot_LDSCRIPT = examples/triface/boot/boot.ld
-boot_LDFLAGS = -Wl,--relax
+boot_LDFLAGS = -Wl,--relax -Wl,--section-start=.text=$(BOOT_ADDR_START)
+
+