X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=inline;f=app%2Ftriface%2Ftriface.mk;h=fe5fdcfea9489e7720d13e1ea9929d4e2f4ebd3d;hb=515886be3106584a6d695d4b5453730121b91f74;hp=9e89cf6c06940bb95683b171013e209a9919a25c;hpb=cbab5cfe6696b8c288835b62b8c51ceb53cb7262;p=bertos.git

diff --git a/app/triface/triface.mk b/app/triface/triface.mk
index 9e89cf6c..fe5fdcfe 100644
--- a/app/triface/triface.mk
+++ b/app/triface/triface.mk
@@ -5,13 +5,10 @@
 #
 # Makefile fragment for DevLib triface application.
 #
-# Author: Bernardo Innocenti <bernie@develer.com>
+# Author: Bernie Innocenti <bernie@codewiz.org>
 #
 #
 
-# This is an embedded project
-triface_EMBEDDED_TGT = 1
-
 # Set to 1 for debug builds
 triface_DEBUG = 1
 
@@ -50,16 +47,8 @@ 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
-
-
-boot_EMBEDDED_TGT = 1
 # Set to 1 for debug builds
-boot_DEBUG = 1
+boot_DEBUG = 0
 
 # Our target application
 TRG += boot
@@ -67,22 +56,17 @@ TRG += boot
 boot_MCU = atmega64
 boot_CSRC = \
 	app/triface/boot/main.c \
-	bertos/mware/xmodem.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/algos/crc.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/boot -Ibertos/cpu/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
-