projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 b8782f75c08f1ae40845688d5998752e5a466caa..e9861a064c324e0fcfcd16af88d59ef0eb65b671 100644
(file)
--- a/
examples/triface/triface.mk
+++ b/
examples/triface/triface.mk
@@
-37,18
+37,18
@@
triface_CSRC = \
examples/triface/triface.c \
examples/triface/protocol.c \
examples/triface/hw/hw_adc.c \
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/drv/sipo.c \
bertos/drv/timer.c \
bertos/drv/ser.c \
bertos/drv/buzzer.c \
bertos/drv/sipo.c \
- bertos/cpu/avr/drv/ser_avr.c \
- bertos/cpu/avr/drv/timer_avr.c \
bertos/mware/formatwr.c \
bertos/mware/hex.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/mware/readline.c \
bertos/mware/parser.c \
bertos/mware/event.c \
+ bertos/struct/hashtable.c \
bertos/kern/kfile.c \
bertos/net/keytag.c \
#
bertos/kern/kfile.c \
bertos/net/keytag.c \
#
@@
-56,7
+56,7
@@
triface_CSRC = \
triface_PCSRC += bertos/mware/formatwr.c
triface_PCSRC += bertos/mware/formatwr.c
-triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -D'CPU_FREQ=(14745600UL)' -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
triface_LDFLAGS = -Wl
@@
-69,18
+69,20
@@
TRG += boot
boot_MCU = $(CPU)
boot_CSRC = \
examples/triface/boot/main.c \
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/cpu/avr/drv/ser_avr.c \
bertos/cpu/avr/drv/flash_avr.c \
- bertos/cpu/avr/drv/timer_avr.c \
bertos/drv/timer.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 \
#
bertos/algo/crc.c \
bertos/mware/hex.c \
bertos/kern/kfile.c \
#
+
boot_PREFIX = avr-
boot_PREFIX = avr-
-boot_CPPFLAGS = -D'ARCH=(ARCH_TRIFACE|ARCH_BOOT)' -D'CPU_FREQ=(14745600UL)' -Iexamples/triface/boot -Ibertos/cpu/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_LDFLAGS = -Wl,--relax -Wl,--section-start=.text=$(BOOT_ADDR_START)
boot_CFLAGS = -Os -mcall-prologues
boot_LDFLAGS = -Wl,--relax -Wl,--section-start=.text=$(BOOT_ADDR_START)