projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor KFileFlashAvr in FlashAvrKFile. Tested. It work.
[bertos.git]
/
bertos
/
config.mk
diff --git
a/bertos/config.mk
b/bertos/config.mk
index b21b2c1f96210576eff3606c293eabee5a6797b3..1c5cb56897caf81eb9736cbaf0c705d54167ad01 100644
(file)
--- a/
bertos/config.mk
+++ b/
bertos/config.mk
@@
-3,7
+3,7
@@
# Copyright 2002,2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
# All rights reserved.
#
# Copyright 2002,2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
# All rights reserved.
#
-# Author: Bern
ardo Innocenti <bernie@develer.com
>
+# Author: Bern
ie Innocenti <bernie@codewiz.org
>
# Based on: GCC-AVR standard Makefile part 1, Volker Oth 1/2000
#
# Based on: GCC-AVR standard Makefile part 1, Volker Oth 1/2000
#
@@
-13,11
+13,6
@@
-include pgm_config.mk
DPROG ?= -V -c stk500 -P /dev/ttyS0
-include pgm_config.mk
DPROG ?= -V -c stk500 -P /dev/ttyS0
-# Set to 1 to build for embedded devices.
-# e.g. produce target.elf instead of target and target_nostrip
-#EMBEDDED_TARGET = 1
-EMBEDDED_TARGET = 0
-
OPTCFLAGS = -ffunction-sections -fdata-sections
#OPTCFLAGS = -funsafe-loop-optimizations
OPTCFLAGS = -ffunction-sections -fdata-sections
#OPTCFLAGS = -funsafe-loop-optimizations
@@
-74,11
+69,9
@@
DEP_FLAGS = -MMD -MP
LIST_FLAGS = -Wa,-anhlmsd=$(@:.o=.lst)
# Linker flags for generating map files
LIST_FLAGS = -Wa,-anhlmsd=$(@:.o=.lst)
# Linker flags for generating map files
-ifeq ($(EMBEDDED_TARGET), 1)
-MAP_FLAGS = -Wl,-Map=$(@:%.elf=%.map),--cref
-else
-MAP_FLAGS =
-endif
+# Only in embedded related projects generate map files
+MAP_FLAGS_EMB = -Wl,-Map=$(@:%.elf=%.map),--cref
+MAP_FLAGS_HOST =
# Compiler warning flags for both C and C++
WARNFLAGS = \
# Compiler warning flags for both C and C++
WARNFLAGS = \
@@
-113,7
+106,7
@@
ASFLAGS = $(DEBUGCFLAGS)
#LDFLAGS = $(MAP_FLAGS)
#bernie: does not complain for missing symbols!
#LDFLAGS = $(MAP_FLAGS)
#bernie: does not complain for missing symbols!
-LDFLAGS =
$(MAP_FLAGS)
-Wl,--gc-sections
+LDFLAGS = -Wl,--gc-sections
# Flags for avrdude
AVRDUDEFLAGS = $(DPROG)
# Flags for avrdude
AVRDUDEFLAGS = $(DPROG)