Disable unmantained heap handling (for now).

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

diff --git a/examples/triface/triface.mk b/examples/triface/triface.mk
index 3b0ae2836cc72309ffa6b8531084db5576a414e4..e9861a064c324e0fcfcd16af88d59ef0eb65b671 100644 (file)
--- a/examples/triface/triface.mk
+++ b/examples/triface/triface.mk
@@ -15,14 +15,15 @@ triface_DEBUG = 1
 # Our target application
 TRG += triface
 CPU = atmega1281
+BOOT_ADDR_START = 0x1E000
 
-triface_CROSS = avr-
+triface_PREFIX = avr-
 
 ifeq ($(CPU), atmega1281)
 triface_hfuse = 0x98
 triface_lfuse = 0x3d
 triface_efuse = 0x7f
-triface_lock = 0xff
+triface_lock = 0x2f
 else
 triface_hfuse = 0x88
 triface_lfuse = 0xff
@@ -36,17 +37,18 @@ triface_CSRC = \
        examples/triface/triface.c \
        examples/triface/protocol.c \
        examples/triface/hw/hw_adc.c \
+       bertos/cpu/avr/drv/ser_avr.c \
+       bertos/cpu/avr/drv/timer_avr.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/drv/sipo.c \
        bertos/mware/formatwr.c \
        bertos/mware/hex.c \
-       bertos/struct/hashtable.c \
        bertos/mware/readline.c \
        bertos/mware/parser.c \
        bertos/mware/event.c \
+       bertos/struct/hashtable.c \
        bertos/kern/kfile.c \
        bertos/net/keytag.c \
        #
@@ -54,7 +56,7 @@ 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)'  -D'WIZ_AUTOGEN' -fno-strict-aliasing -Iexamples/triface -Ibertos/cpu/avr
 triface_LDFLAGS = -Wl
 
 
@@ -67,17 +69,21 @@ TRG += boot
 boot_MCU = $(CPU)
 boot_CSRC = \
        examples/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/cpu/avr/drv/timer_avr.c \
+       bertos/drv/ser.c \
+       bertos/net/xmodem.c \
        bertos/algo/crc.c \
        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)' -D'WIZ_AUTOGEN' -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)
+
+