X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=config.mk;h=8c857e4372402a2cedffa1f4954ec1e2cbac0b3c;hb=49d4f9b278ec7da35bbf2dcd3f5013940d1a74e3;hp=e78f4e13de16117a557256db35de76b2033222c2;hpb=afbca8635b31f43f936b87dca60d40cd4a974559;p=bertos.git

diff --git a/config.mk b/config.mk
old mode 100755
new mode 100644
index e78f4e13..8c857e43
--- a/config.mk
+++ b/config.mk
@@ -10,36 +10,6 @@
 # Author: Bernardo Innocenti <bernie@develer.com>
 #
 # $Log$
-# Revision 1.11  2007/09/29 15:54:14  bernie
-# Make demo Qt emulator compile again.
-#
-# Revision 1.10  2007/09/18 10:17:00  batt
-# Merge from triface.
-#
-# Revision 1.9  2006/09/20 14:28:42  marco
-# Add MOC. Changed OPTCFLAGS.
-#
-# Revision 1.8  2006/09/19 17:50:56  bernie
-# Make native build the default.
-#
-# Revision 1.7  2006/07/19 12:56:24  bernie
-# Convert to new Doxygen style.
-#
-# Revision 1.6  2006/06/12 22:05:09  marco
-# Bring back config wrongly commited
-#
-# Revision 1.4  2006/05/27 22:41:46  bernie
-# Tweak optimization flags for loops.
-#
-# Revision 1.3  2006/05/18 00:40:10  bernie
-# Setup for AVR development.
-#
-# Revision 1.2  2006/03/27 04:48:33  bernie
-# Add CXXFLAGS; Add recursive targets.
-#
-# Revision 1.1  2006/03/22 09:51:53  bernie
-# Add build infrastructure.
-#
 #
 
 #
@@ -62,6 +32,11 @@ DPROG ?= -V -c stk500 -P /dev/ttyS0
 # PonyProg serial programmer
 #DPROG = -c dasa2
 
+# 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
 
@@ -74,18 +49,23 @@ DEBUGCFLAGS = -ggdb
 #
 # define some variables based on the AVR base path in $(AVR)
 #
-CROSS   = #avr-
-CC      = $(CROSS)gcc
-CXX     = $(CROSS)g++
+#CROSS   = avr-
+CC      = gcc
+CXX     = g++
 AS      = $(CC) -x assembler-with-cpp
 LD      = $(CC)
-OBJCOPY = $(CROSS)objcopy
-STRIP   = $(CROSS)strip
+OBJCOPY = objcopy
+STRIP   = strip
 INSTALL = cp -a
 RM      = rm -f
 RM_R    = rm -rf
 RN      = mv
 MKDIR_P = mkdir -p
+SHELL   = /bin/sh
+CHECKER = sparse
+DOXYGEN = doxygen
+AVRDUDE = avrdude
+FLEXCAT = $(top_srcdir)/tools/flexcat/flexcat
 
 # For conversion from ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
 COFFCONVERT=$(OBJCOPY) \
@@ -99,11 +79,6 @@ INCDIR  = -I. -Ihw
 LIBDIR  = lib
 OBJDIR  = obj
 OUTDIR  = images
-SHELL   = /bin/sh
-DOXYGEN = doxygen
-UISP    = uisp
-AVRDUDE = avrdude
-FLEXCAT = $(top_srcdir)/tools/flexcat/flexcat
 
 # output format can be srec, ihex (avrobj is always created)
 FORMAT = srec
@@ -116,8 +91,11 @@ DEP_FLAGS = -MMD -MP
 LIST_FLAGS = -Wa,-anhlmsd=$(@:.o=.lst)
 
 # Linker flags for generating map files
-#bernie: bogus binutils from Fedora 6 can't cope with this
-#MAP_FLAGS = -Wl,-Map=$(@:%.elf=%.map),--cref
+ifeq ($(EMBEDDED_TARGET), 1)
+MAP_FLAGS = -Wl,-Map=$(@:%.elf=%.map),--cref
+else
+MAP_FLAGS =
+endif
 
 # Compiler warning flags for both C and C++
 WARNFLAGS = \