X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Ftriface%2Ftriface.mk;h=f208dfa33bfb0dd429bd4110d477f92f0c97f7be;hb=b4aea3cdf30cbc54bf5d1efcc909c83b559446dd;hp=9cf4fed620164094261cb4a20fd9b44574dafc89;hpb=d29e3fcf59e19b2cafe8f9294388e8c759c56cc6;p=bertos.git

diff --git a/app/triface/triface.mk b/app/triface/triface.mk
index 9cf4fed6..f208dfa3 100644
--- a/app/triface/triface.mk
+++ b/app/triface/triface.mk
@@ -5,11 +5,10 @@
 #
 # Makefile fragment for DevLib triface application.
 #
-# Author: Bernardo Innocenti <bernie@develer.com>
+# Author: Bernie Innocenti <bernie@codewiz.org>
 #
 #
 
-
 # Set to 1 for debug builds
 triface_DEBUG = 1
 
@@ -31,7 +30,7 @@ triface_CSRC = \
 	bertos/cpu/avr/drv/sipo.c \
 	bertos/mware/formatwr.c \
 	bertos/mware/hex.c \
-	bertos/mware/hashtable.c \
+	bertos/struct/hashtable.c \
 	bertos/mware/readline.c \
 	bertos/mware/parser.c \
 	bertos/mware/event.c \
@@ -42,15 +41,32 @@ triface_CSRC = \
 triface_PCSRC += bertos/mware/formatwr.c
 
 
-triface_CFLAGS = -O2 -D'ARCH=0' -fno-strict-aliasing -Iapp/triface -Ibertos/cpu/avr
+triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -fno-strict-aliasing -Iapp/triface -Ibertos/cpu/avr
 triface_LDFLAGS = -Wl
 
 triface_MCU = atmega64
 triface_CROSS = avr-
 
-# Debug stuff
-ifeq ($(triface_DEBUG),1)
-	triface_CFLAGS += -D_DEBUG
-	triface_PCSRC += bertos/drv/kdebug.c
-endif
+# Set to 1 for debug builds
+boot_DEBUG = 0
 
+# 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