X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Ftriface%2Ftriface.mk;h=8c8d566a45fcc14054b5c2398ee8cd063afc5e44;hb=4cc44c9888a0336b9d01121ec0b7ad95f4a76195;hp=245df818128e860458ade67103a4c467e805bae7;hpb=4ac43159891e8090defc821852e2753d7508bf5f;p=bertos.git

diff --git a/app/triface/triface.mk b/app/triface/triface.mk
index 245df818..8c8d566a 100644
--- a/app/triface/triface.mk
+++ b/app/triface/triface.mk
@@ -5,10 +5,12 @@
 #
 # 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
@@ -24,25 +26,25 @@ triface_CSRC = \
 	app/triface/triface.c \
 	app/triface/protocol.c \
 	app/triface/hw/hw_adc.c \
-	drv/timer.c \
-	drv/ser.c \
-	cpu/avr/drv/ser_avr.c \
-	cpu/avr/drv/sipo.c \
-	mware/formatwr.c \
-	mware/hex.c \
-	mware/hashtable.c \
-	mware/readline.c \
-	mware/parser.c \
-	mware/event.c \
-	kern/kfile.c \
-	net/keytag.c \
-	drv/buzzer.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 += mware/formatwr.c
+triface_PCSRC += bertos/mware/formatwr.c
 
 
-triface_CFLAGS = -O2 -D'ARCH=0' -fno-strict-aliasing -Iapp/triface -Iapp/triface/hw -Icpu/avr
+triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -fno-strict-aliasing -Iapp/triface -Ibertos/cpu/avr
 triface_LDFLAGS = -Wl
 
 triface_MCU = atmega64
@@ -51,6 +53,38 @@ 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 = 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
+
+# Debug stuff
+ifeq ($(boot_DEBUG),1)
+	boot_CFLAGS += -D_DEBUG
+	boot_PCSRC += bertos/drv/kdebug.c bertos/mware/formatwr.c
 endif