X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Frules.mk;h=6b858474124b85b6cbdbf5a991af093e369e438d;hb=57dfb183e24175bc782647d4e6aebe31063f3881;hp=b83049dd30d0d9e8c4d2436244abbbafdbe1c934;hpb=a2fc2366ad564f11e705703ed1f42b7dc499a47c;p=bertos.git diff --git a/bertos/rules.mk b/bertos/rules.mk index b83049dd..6b858474 100644 --- a/bertos/rules.mk +++ b/bertos/rules.mk @@ -7,7 +7,7 @@ # GCC-AVR standard Makefile part 2 # Volker Oth 1/2000 # -# Author: Bernardo Innocenti +# Author: Bernie Innocenti # # Remove all default pattern rules @@ -39,6 +39,7 @@ top_srcdir ?= $(shell pwd) # Virtual Product: based on target products may be different. # e.g. Embedded target = hex, s19, bin # Hosted = exe +# Library = lib.a TRG_TGT = $(TRG:%=$(OUTDIR)/%.tgt) RECURSIVE_TARGETS = all-recursive install-recursive clean-recursive @@ -63,55 +64,107 @@ tags: .PHONY: check check: $L "Running testsuite" - $Q ./run_tests.sh + $Q test/run_tests.sh define build_target -ifeq ($$($(1)_EMBEDDED_TGT),1) -#use embedded specific map flags -$(1)_MAP_FLAGS = $$(MAP_FLAGS_EMB) -#In embedded we need s19, hex and bin -$$(OUTDIR)/$(1).tgt : $$(OUTDIR)/$(1).s19 $$(OUTDIR)/$(1).hex $$(OUTDIR)/$(1).bin +ifeq ($$($(1)_HOSTED),1) + #On Darwin architecture the assembly doesn't link correctly if these flags are set. + ifeq ($(shell uname | grep -c "Darwin"),1) + LIST_FLAGS := "" + MAP_FLAGS := "" + LDFLAGS := "" + endif + #use hosted specific map flags + $(1)_MAP_FLAGS = $$(MAP_FLAGS_HOST) + + #Handle library creation + ifeq ($$($(1)_MAKELIB),1) + $$(OUTDIR)/$(1).tgt : $$(OUTDIR)/$(1).a + else + #Otherwise in hosted application we need only executable file. + $$(OUTDIR)/$(1).tgt : $$(OUTDIR)/$(1) + endif else -#On Darwin architecture the assembly doesn't link correctly if this flag is setted. -ifeq ($(shell uname | grep -c "Darwin"),1) -LIST_FLAGS = "" -MAP_FLAGS = "" -LDFLAGS = "" -endif -#use hosted specific map flags -$(1)_MAP_FLAGS = $$(MAP_FLAGS_HOST) -#in hosted application we need only executable file. -$$(OUTDIR)/$(1).tgt : $$(OUTDIR)/$(1) + #use embedded specific map flags + $(1)_MAP_FLAGS = $$(MAP_FLAGS_EMB) + #In embedded we need s19, hex and bin + $$(OUTDIR)/$(1).tgt : $$(OUTDIR)/$(1).s19 $$(OUTDIR)/$(1).hex $$(OUTDIR)/$(1).bin endif $(1)_LDFLAGS += $$($(1)_MAP_FLAGS) +# In embedded systems the target CPU is needed, +# but there are different options on how to pass +# it to the compiler. ifneq ($$(strip $$($(1)_MCU)),) -# Define all project specific object files -$(1)_CFLAGS += -mmcu=$$($(1)_MCU) -$(1)_CXXFLAGS += -mmcu=$$($(1)_MCU) -$(1)_ASFLAGS += -mmcu=$$($(1)_MCU) -$(1)_CPPAFLAGS += -mmcu=$$($(1)_MCU) -$(1)_LDFLAGS += -mmcu=$$($(1)_MCU) + $(1)_MCPU = -mmcu=$$($(1)_MCU) endif ifneq ($$(strip $$($(1)_CPU)),) -# Define all project specific object files -$(1)_CFLAGS += -mcpu=$$($(1)_CPU) -$(1)_CXXFLAGS += -mcpu=$$($(1)_CPU) -$(1)_ASFLAGS += -mcpu=$$($(1)_CPU) -$(1)_CPPAFLAGS += -mcpu=$$($(1)_CPU) -$(1)_LDFLAGS += -mcpu=$$($(1)_CPU) + $(1)_MCPU = -mcpu=$$($(1)_CPU) +endif + +# If a CPU is specified add to +# project specific flags. +ifneq ($$($(1)_MCPU),) + $(1)_CFLAGS += $$($(1)_MCPU) + $(1)_CXXFLAGS += $$($(1)_MCPU) + $(1)_ASFLAGS += $$($(1)_MCPU) + $(1)_CPPAFLAGS += $$($(1)_MCPU) + $(1)_LDFLAGS += $$($(1)_MCPU) endif + ifneq ($$(strip $$($(1)_LDSCRIPT)),) -$(1)_LDFLAGS += -Wl,-T$$($(1)_LDSCRIPT) + $(1)_LDFLAGS += -Wl,-T$$($(1)_LDSCRIPT) endif -$(1)_CC = $$($(1)_CROSS)$$(CC) -$(1)_CXX = $$($(1)_CROSS)$$(CXX) -$(1)_AS = $$($(1)_CROSS)$$(AS) -$(1)_OBJCOPY = $$($(1)_CROSS)$$(OBJCOPY) -$(1)_STRIP = $$($(1)_CROSS)$$(STRIP) +ifneq ($$($(1)_CROSS),) + #deprecated: use PREFIX, SUFFIX and HOSTED mechanism instead + $(1)_PREFIX = $$($(1)_CROSS) + $(1)_SUFFIX = +endif + +$(1)_CC ?= $$($(1)_PREFIX)$$(CC)$$($(1)_SUFFIX) +$(1)_CXX ?= $$($(1)_PREFIX)$$(CXX)$$($(1)_SUFFIX) +$(1)_AS ?= $$($(1)_PREFIX)$$(AS)$$($(1)_SUFFIX) +$(1)_AR ?= $$($(1)_PREFIX)$$(AR)$$($(1)_SUFFIX) +$(1)_OBJCOPY ?= $$($(1)_PREFIX)$$(OBJCOPY)$$($(1)_SUFFIX) +$(1)_STRIP ?= $$($(1)_PREFIX)$$(STRIP)$$($(1)_SUFFIX) +ifneq ($$(strip $$($(1)_CXXSRC)),) + $(1)_LD = $$($(1)_PREFIX)$$(LDXX)$$($(1)_SUFFIX) +else + $(1)_LD = $$($(1)_PREFIX)$$(LD)$$($(1)_SUFFIX) +endif + +# Debug stuff +ifeq ($$($(1)_DEBUG),1) + # AVR is an harvard processor + # and needs debug module + # to be compiled in program memory + ifeq ($$(findstring avr, $$($(1)_PREFIX)),avr) + $(1)_DEBUGSRC = $(1)_PCSRC + else + $(1)_DEBUGSRC = $(1)_CSRC + endif + + $$($(1)_DEBUGSRC) += bertos/drv/kdebug.c + + # Also add formatwr.c (printf) if not already present + ifneq ($$(findstring formatwr.c, $$($$($(1)_DEBUGSRC))),formatwr.c) + $$($(1)_DEBUGSRC) += bertos/mware/formatwr.c + endif + + # Also add hex.c (for printf) if not already present + ifneq ($$(findstring hex.c, $$($$($(1)_CSRC))),hex.c) + $$($(1)_CSRC) += bertos/mware/hex.c + endif + + $(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)) $(1)_CXXOBJ = $$(foreach file,$$($(1)_CXXSRC:%.cpp=%.o),$$(OBJDIR)/$(1)/$$(file)) @@ -122,46 +175,40 @@ $(1)_OBJ := $$($(1)_COBJ) $$($(1)_CXXOBJ) $$($(1)_PCOBJ) $$($(1)_AOBJ) $$($(1 $(1)_SRC := $$($(1)_CSRC) $$($(1)_CXXSRC) $$($(1)_PCSRC) $$($(1)_ASRC) $$($(1)_CPPASRC) OBJ += $$($(1)_OBJ) -ifneq ($$(strip $$($(1)_CXXSRC)),) -$(1)_LD = $$($(1)_CROSS)$$(LDXX) -else -$(1)_LD = $$($(1)_CROSS)$$(LD) -endif - # Compile: instructions to create assembler and/or object files from C source $$($(1)_COBJ) : $$(OBJDIR)/$(1)/%.o : %.c $L "$(1): Compiling $$< (C)" @$$(MKDIR_P) $$(dir $$@) - $Q $$($(1)_CC) -c $$(CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@ + $Q $$($(1)_CC) -c $$(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 @@ -170,6 +217,13 @@ $$(OUTDIR)/$(1).elf $$(OUTDIR)/$(1)_nostrip: bumprev $$($(1)_OBJ) $$($(1)_LDSCRI @$$(MKDIR_P) $$(dir $$@) $Q $$($(1)_LD) $$($(1)_OBJ) $$(LIB) $$(LDFLAGS) $$($(1)_LDFLAGS) -o $$@ + +# Instructions to create a static library from object files +$$(OUTDIR)/$(1).a: bumprev $$($(1)_OBJ) + $L "$(1): Creating static library $$@" + @$$(MKDIR_P) $$(dir $$@) + $Q $$($(1)_AR) $$(ARFLAGS) $$($(1)_ARFLAGS) $$@ $$($(1)_OBJ) + # Strip debug info $$(OUTDIR)/$(1): $$(OUTDIR)/$(1)_nostrip $L "$(1): Generating stripped executable $$@" @@ -182,17 +236,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 \ @@ -241,7 +340,7 @@ $(foreach t,$(TRG),$(eval $(call build_target,$(t)))) # NOTE: moc totally sucks and can generate empty files for some error conditions, # leading to puzzling linker errors. Kill 'em and abort build. %_moc.cpp: %.h - $(MOC) -o $@ $< + $(QT_MOC) -o $@ $< if [ ! -s $< ]; then \ rm -f $@; \ exit 1; \ @@ -279,23 +378,20 @@ $(RECURSIVE_TARGETS): BUILDREV_H = buildrev.h -ifeq ($(shell [ -e bertos/verstag.c ] && echo yes),yes) .PHONY: bumprev bumprev: - @buildnr=0; \ - if [ -f $(BUILDREV_H) ]; then \ - buildnr=`sed <"$(BUILDREV_H)" -n -e 's/#define VERS_BUILD \([0-9][0-9]*\)/\1/p'`; \ + @if [ -e bertos/verstag.c ]; then \ + buildnr=0; \ + if [ -f $(BUILDREV_H) ]; then \ + buildnr=`sed <"$(BUILDREV_H)" -n -e 's/#define VERS_BUILD \([0-9][0-9]*\)/\1/p'`; \ + fi; \ + buildnr=`expr $$buildnr + 1`; \ + buildhost=`hostname | sed -n -e '1h;2,$$H;$${g;s/\n//g;p;}'`; \ + echo "#define VERS_BUILD $$buildnr" >"$(BUILDREV_H)"; \ + echo "#define VERS_HOST \"$$buildhost\"" >>"$(BUILDREV_H)"; \ + echo "Building revision $$buildnr"; \ fi; \ - buildnr=`expr $$buildnr + 1`; \ - buildhost=`hostname | sed -n -e '1h;2,$$H;$${g;s/\n//g;p;}'`; \ - echo "#define VERS_BUILD $$buildnr" >"$(BUILDREV_H)"; \ - echo "#define VERS_HOST \"$$buildhost\"" >>"$(BUILDREV_H)"; \ - echo "Building revision $$buildnr" -else -.PHONY: bumprev -bumprev: - -endif + # # Include dependencies ifneq ($(strip $(OBJ)),)