Start to merge old triface project in bertos, not working actually

[bertos.git] / app / triface / triface.mk

diff --git a/app/triface/triface.mk b/app/triface/triface.mk
index bc0d7d044cebdb1e71cb724aed72e4efbe2f9b48..a30697f89a309577045d122b3ad167bff6a66ed5 100644 (file)
--- a/app/triface/triface.mk
+++ b/app/triface/triface.mk
@@ -7,18 +7,10 @@
 #
 # Author: Bernardo Innocenti <bernie@develer.com>
 #
-# $Log$
-# Revision 1.3  2006/06/12 21:37:02  marco
-# implemented some commands (ver and sleep)
-#
-# Revision 1.2  2006/06/01 12:29:21  marco
-# Add first simple protocol command (version request).
-#
-# Revision 1.1  2006/05/18 00:41:47  bernie
-# New triface devlib application.
-#
 #
 
+# This is an embedded project
+triface_EMBEDDED_TGT = 1
 
 # Set to 1 for debug builds
 triface_DEBUG = 1
@@ -26,29 +18,73 @@ triface_DEBUG = 1
 # Our target application
 TRG += triface
 
+triface_hfuse = 0x88
+triface_lfuse = 0xff
+triface_efuse = 0xff
+triface_lock = 0x2f
 triface_CSRC = \
        app/triface/triface.c \
        app/triface/protocol.c \
-       drv/timer.c \
-       drv/ser.c \
-       cpu/avr/drv/ser_avr.c \
-       mware/formatwr.c \
-       mware/hex.c \
-       mware/hashtable.c \
-       mware/readline.c \
-       mware/parser.c \
+       app/triface/hw/hw_adc.c \
+       bertos/drv/timer.c \
+       bertos/drv/ser.c \
+       bertos/drv/buzzer.c \
+       bertos/cpu/avr/drv/ser_avr.c \
+       bertos/cpu/avr/drv/sipo.c \
+       bertos/mware/formatwr.c \
+       bertos/mware/hex.c \
+       bertos/mware/hashtable.c \
+       bertos/mware/readline.c \
+       bertos/mware/parser.c \
+       bertos/mware/event.c \
+       bertos/kern/kfile.c \
+       bertos/net/keytag.c \
+       #
+
+triface_PCSRC += bertos/mware/formatwr.c
 
-#      drv/buzzer.c
 
-triface_PCSRC += mware/formatwr.c
+triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -fno-strict-aliasing -Iapp/triface -Ibertos/cpu/avr
+triface_LDFLAGS = -Wl
 
-#triface_CFLAGS = -O3 -D'ARCH=0' -Iapp/triface/hw -Iapp/triface
-triface_CFLAGS = -O0 -D'ARCH=0' -Iapp/triface/hw -Iapp/triface -Icpu/avr
-triface_MCU = atmega128
+triface_MCU = atmega64
+triface_CROSS = avr-
 
 # Debug stuff
 ifeq ($(triface_DEBUG),1)
        triface_CFLAGS += -D_DEBUG
-       triface_PCSRC += drv/kdebug.c
+       triface_PCSRC += bertos/drv/kdebug.c
+endif
+
+
+boot_EMBEDDED_TGT = 1
+# Set to 1 for debug builds
+boot_DEBUG = 1
+
+# Our target application
+TRG += boot
+
+boot_MCU = atmega64
+boot_CSRC = \
+       app/triface/boot/main.c \
+       bertos/net/xmodem.c \
+       bertos/drv/ser.c \
+       bertos/cpu/avr/drv/ser_avr.c \
+       bertos/cpu/avr/drv/flash_avr.c \
+       bertos/drv/timer.c \
+       bertos/algo/crc.c \
+       bertos/mware/hex.c \
+    bertos/kern/kfile.c \
+    #
+boot_CROSS = avr-
+boot_CPPFLAGS = -D'ARCH=(ARCH_TRIFACE|ARCH_BOOT)' -Iapp/triface/boot -Ibertos/cpu/avr
+boot_CFLAGS = -Os -mcall-prologues
+boot_LDSCRIPT = app/triface/boot/boot.ld
+boot_LDFLAGS = -Wl,--relax
+
+# Debug stuff
+ifeq ($(boot_DEBUG),1)
+       boot_CFLAGS += -D_DEBUG
+       boot_PCSRC += bertos/drv/kdebug.c bertos/mware/formatwr.c
 endif