X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Frules.mk;h=8ec098ae375aeb22f446c65de59676a2e3f86a05;hb=d34c4c92b4d64258077e1caeb0723db404ae9951;hp=6096accf67c2ad26f4506dd1673527166a1c5e13;hpb=4566bef0b064c05231dd0291c3b4cbbd5c1dfdfd;p=bertos.git

diff --git a/bertos/rules.mk b/bertos/rules.mk
index 6096accf..8ec098ae 100644
--- a/bertos/rules.mk
+++ b/bertos/rules.mk
@@ -161,6 +161,9 @@ ifeq ($$($(1)_DEBUG),1)
 
         $(1)_CFLAGS += -D_DEBUG
         $(1)_CXXFLAGS += -D_DEBUG
+else
+        $(1)_CFLAGS += -fomit-frame-pointer
+        $(1)_CXXFLAGS += -fomit-frame-pointer
 endif
 
 $(1)_COBJ    = $$(foreach file,$$($(1)_CSRC:%.c=%.o),$$(OBJDIR)/$(1)/$$(file))
@@ -185,36 +188,36 @@ endif
 $$($(1)_COBJ) : $$(OBJDIR)/$(1)/%.o : %.c
 	$L "$(1): Compiling $$< (C)"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$($(1)_CC) -c $$($(1)_REAL_CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
+	$Q $$($(1)_CC) -c $$($(1)_REAL_CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$($$(*F)_CFLAGS) $$< -o $$@
 
 # Compile: instructions to create assembler and/or object files from C++ source
 $$($(1)_CXXOBJ) : $$(OBJDIR)/$(1)/%.o : %.cpp
 	$L "$(1): Compiling $$< (C++)"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$($(1)_CXX) -c $$(CXXFLAGS) $$($(1)_CXXFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
+	$Q $$($(1)_CXX) -c $$(CXXFLAGS) $$($(1)_CXXFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$($$(*F)_CXXFLAGS) $$< -o $$@
 
 # Generate assembly sources from C files (debug)
 $$(OBJDIR)/$(1)/%.s : %.c
 	$L "$(1): Generating asm source $$<"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$($(1)_CC) -S $$(CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$< -o $$@
+	$Q $$($(1)_CC) -S $$(CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$($$(*F)_CFLAGS) $$< -o $$@
 
 # Generate special progmem variant of a source file
 $$($(1)_PCOBJ) : $$(OBJDIR)/$(1)/%_P.o : %.c
 	$L "$(1): Compiling $$< (PROGMEM)"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$($(1)_CC) -c -D_PROGMEM $$(CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
+	$Q $$($(1)_CC) -c -D_PROGMEM $$(CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$($$(*F)_CFLAGS) $$< -o $$@
 
 # Assemble: instructions to create object file from assembler files
 $$($(1)_AOBJ): $$(OBJDIR)/$(1)/%.o : %.s
 	$L "$(1): Assembling $$<"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$($(1)_AS) -c $$(ASFLAGS) $$($(1)_ASFLAGS) $$< -o $$@
+	$Q $$($(1)_AS) -c $$(ASFLAGS) $$($(1)_ASFLAGS) $$($$(*F)_ASFLAGS) $$< -o $$@
 
 $$($(1)_CPPAOBJ): $$(OBJDIR)/$(1)/%.o : %.S
 	$L "$(1): Assembling with CPP $$<"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$($(1)_CC) -c $$(CPPAFLAGS) $$($(1)_CPPAFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
+	$Q $$($(1)_CC) -c $$(CPPAFLAGS) $$($(1)_CPPAFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$($$(*F)_CPPAFLAGS) $$< -o $$@
 
 
 # Link: instructions to create elf output file from object files
@@ -242,17 +245,62 @@ $$(OUTDIR)/$(1)_whole.elf: bumprev $$($(1)_SRC) $$($(1)_LDSCRIPT)
 	$Q $$($(1)_CC) $$($(1)_SRC) $$(CFLAGS) $$($(1)_CFLAGS) $$(LIB) $$(LDFLAGS) $$($(1)_LDFLAGS) -o $$@
 
 # Flash target
-# NOTE: we retry in case of failure because the STK500 programmer is crappy
 .PHONY: flash_$(1)
-flash_$(1): $(OUTDIR)/$(1).s19 flash_$(1)_local
-	if ! $(AVRDUDE) $(DPROG) -p $$($(1)_MCU) -U flash:w:$$< ; then \
-	     $(AVRDUDE) $(DPROG) -p $$($(1)_MCU) -U flash:w:$$< ; \
+flash_$(1): $(OUTDIR)/$(1).hex flash_$(1)_local
+	$L "$(1): Flashing target"
+	$Q if [ ! -f $$($(1)_FLASH_SCRIPT) ] ; then \
+		printf "CLDLG: No flash script found.\n" ; \
+		exit 1 ; \
 	fi
-	#avarice --mkII -j usb --erase --program --verify --file images/triface.elf
+	$Q if [ ! "$$($(1)_PROGRAMMER_TYPE)" == "none" ] ; then \
+		PROGRAMMER_CPU=$$($(1)_PROGRAMMER_CPU) PROGRAMMER_TYPE=$$($(1)_PROGRAMMER_TYPE) \
+		PROGRAMMER_PORT=$$($(1)_PROGRAMMER_PORT) IMAGE_FILE=$$< \
+		$$($(1)_FLASH_SCRIPT) ; \
+	else \
+		printf "CLDLG: No programmer interface configured, see http://dev.bertos.org/wiki/ProgrammerInterface\n" ; \
+		exit 1 ; \
+	fi 
 
 .PHONY: flash_$(1)_local
 flash_$(1)_local:
 
+.PHONY: stopflash_$(1)
+stopflash_$(1): 
+	$L "$(1): Stopping target flashing"
+	$Q if [ ! -f $$($(1)_STOPFLASH_SCRIPT) ] ; then \
+		printf "CLDLG: No stopflash script found.\n" ; \
+		exit 1 ; \
+	fi
+	$Q $$($(1)_STOPFLASH_SCRIPT) ;
+
+
+# Debug target
+.PHONY: debug_$(1)
+debug_$(1): $(OUTDIR)/$(1).elf
+	$L "$(1): Debugging target"
+	$Q if [ ! -f $$($(1)_DEBUG_SCRIPT) ] ; then \
+		printf "CLDLG: No debug script found.\n" ; \
+		exit 1 ; \
+	fi
+	$Q if [ ! "$$($(1)_PROGRAMMER_TYPE)" == "none" ] ; then \
+		PROGRAMMER_CPU=$$($(1)_PROGRAMMER_CPU) PROGRAMMER_TYPE=$$($(1)_PROGRAMMER_TYPE) \
+		PROGRAMMER_PORT=$$($(1)_PROGRAMMER_PORT) GDB_PORT=3333 \
+		ELF_FILE=$$< \
+		$$($(1)_DEBUG_SCRIPT) ; \
+	else \
+		printf "CLDLG: No programmer interface configured, see http://dev.bertos.org/wiki/ProgrammerInterface\n" ; \
+		exit 1 ; \
+	fi
+
+.PHONY: stopdebug_$(1)
+stopdebug_$(1): 
+	$L "$(1): Stopping debugger"
+	$Q if [ ! -f $$($(1)_STOPDEBUG_SCRIPT) ] ; then \
+		printf "CLDLG: No stopdebug script found.\n" ; \
+		exit 1 ; \
+	fi
+	$Q $$($(1)_STOPDEBUG_SCRIPT) ;
+
 .PHONY: fuses_$(!)
 fuses_$(1):
 	if [ ! -z "$$($(1)_efuse)" ] ; then \