projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the need of a specific flag to distinguish between embedded/not embeded targets.
[bertos.git]
/
app
/
triface
/
triface.mk
diff --git
a/app/triface/triface.mk
b/app/triface/triface.mk
index 9e89cf6c06940bb95683b171013e209a9919a25c..4d9fc96304fcb1efebfabef067983657637e1dc1 100644
(file)
--- a/
app/triface/triface.mk
+++ b/
app/triface/triface.mk
@@
-5,13
+5,10
@@
#
# Makefile fragment for DevLib triface application.
#
#
# Makefile fragment for DevLib triface application.
#
-# Author: Bern
ardo Innocenti <bernie@develer.com
>
+# Author: Bern
ie Innocenti <bernie@codewiz.org
>
#
#
#
#
-# This is an embedded project
-triface_EMBEDDED_TGT = 1
-
# Set to 1 for debug builds
triface_DEBUG = 1
# Set to 1 for debug builds
triface_DEBUG = 1
@@
-56,10
+53,8
@@
ifeq ($(triface_DEBUG),1)
triface_PCSRC += bertos/drv/kdebug.c
endif
triface_PCSRC += bertos/drv/kdebug.c
endif
-
-boot_EMBEDDED_TGT = 1
# Set to 1 for debug builds
# Set to 1 for debug builds
-boot_DEBUG =
1
+boot_DEBUG =
0
# Our target application
TRG += boot
# Our target application
TRG += boot
@@
-67,15
+62,17
@@
TRG += boot
boot_MCU = atmega64
boot_CSRC = \
app/triface/boot/main.c \
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/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_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
boot_CFLAGS = -Os -mcall-prologues
boot_LDSCRIPT = app/triface/boot/boot.ld
boot_LDFLAGS = -Wl,--relax