X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=trennfix%2Fsw%2FMakefile;h=248a0c7c9c040a0ca33ecd0c105e5deaf8ac8d30;hb=a296a9fc34e682cdfe8ea7a587f6f727ec789efa;hp=5f3774f61d99464686ecaf70baacefff6be1be7a;hpb=93cb14d45dd54a188bef116c5884d6bd1e410677;p=eisenbahn.git

diff --git a/trennfix/sw/Makefile b/trennfix/sw/Makefile
index 5f3774f..248a0c7 100644
--- a/trennfix/sw/Makefile
+++ b/trennfix/sw/Makefile
@@ -1,129 +1,36 @@
-#----------------------------------------------------------------------------
-#
-# Makefile based on the public domain Makefile by Peter Fleury
-#
-#----------------------------------------------------------------------------
-# On command line:
-#
-# make all = Make software.
-#
-# make clean = Clean out built project files.
-#
-# make coff = Convert ELF to AVR COFF.
-#
-# make extcoff = Convert ELF to AVR Extended COFF.
-#
-# make program = Download the hex file to the device, using avrdude.
-#                Please customize the avrdude settings below first!
-#
-# make debug = Start either simulavr or avarice as specified for debugging,
-#              with avr-gdb or avr-insight as the front end for debugging.
-#
-# make filename.s = Just compile filename.c into the assembler code only.
-#
-# make filename.i = Create a preprocessed source file for use in submitting
-#                   bug reports to the GCC project.
-#
-# To rebuild project do "make clean" then "make all".
-#----------------------------------------------------------------------------
-
-CONFIG?=trennfix_attiny25
-
-include config/${CONFIG}.mk
-
-INCLUDES+=-I mm/include -I include
-SRC+= mm/src/mm_switch.c
-CFLAGS+=-D__HW_CONF_HEADER__="<config/${CONFIG}.h>"
-
-# MCU name
-#MCU ?= atmega328
-
-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#F_CPU ?= 20000000
-
-
-# Output format. (can be srec, ihex, binary)
-FORMAT = ihex
-
-
-# Target file name (without extension).
-TARGET = trennfix
-
-# List C source files here. (C dependencies are automatically generated.)
-#SRC ?= main.c
-
-
-ASRC =
-
-# Optimization level, can be [0, 1, 2, 3, s].
-#     0 = turn off optimization. s = optimize for size.
-#     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
-OPT = s
-
-
-# Debugging format.
-#     Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.
-#     AVR Studio 4.10 requires dwarf-2.
-#     AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
-DEBUG = dwarf-2
-
-
-# List any extra directories to look for include files here.
-#     Each directory must be seperated by a space.
-#     Use forward slashes for directory separators.
-#     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS =
 
+#######################################
 
-# Compiler flag to set the C Standard level.
-#     c89   = "ANSI" C
-#     gnu89 = c89 plus GCC extensions
-#     c99   = ISO C99 standard (not yet fully implemented)
-#     gnu99 = c99 plus GCC extensions
-CSTANDARD = -std=gnu99
+HW?=trennfix_0.4
+PROG?=trennfix
 
+BUILD_DIR=build
 
-# Place -D or -U options here
-CDEFS = -DF_CPU=$(F_CPU)UL  -DBOOT_START=${BOOT_START} -DBOOT_PAGES=${BOOT_PAGES}
-
+#######################################
+# VERBOSITY CONTROL
+ifeq ($(V),)
+Q=@
+else
+Q=
+endif
 
-# Place -I options here
-CINCS =
+include mk/hw/${HW}.mk
+include mk/prog/*.mk
 
-# Bootloader LDFLAGS
-#BOOT_LDFLAGS=-Wl,-Ttext=${BOOT_START}
+INCLUDES+=-I mm/include -I include -I.
+CFLAGS+=-D__HW_CONF_HEADER__="<config/${CONFIG}.h>"
 
-#---------------- Compiler Options ----------------
-#  -g*:          generate debugging information
-#  -O*:          optimization level
-#  -f...:        tuning, see GCC manual and avr-libc documentation
-#  -Wall...:     warning level
-#  -Wa,...:      tell GCC to pass this to the assembler.
-#    -adhlns...: create assembler listing
-CFLAGS += -g$(DEBUG)
-CFLAGS += $(CDEFS) $(CINCS)
-CFLAGS += -O$(OPT)
+CFLAGS += -mmcu=$(MCU) -DF_CPU=$(F_CPU)UL
+CFLAGS += -std=gnu99
 CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
 CFLAGS += -Wall -Wstrict-prototypes
+CFLAGS += -Os -gdwarf-2
 CFLAGS += -Wa,-adhlns=$(<:.c=.lst)
-CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
-CFLAGS += $(CSTANDARD)
+CFLAGS += -MD $(@:.c:.d)
 CFLAGS += $(INCLUDES)
 
-
-#---------------- Assembler Options ----------------
-#  -Wa,...:   tell GCC to pass this to the assembler.
-#  -ahlms:    create listing
-#  -gstabs:   have the assembler create line number information; note that
-#             for use in COFF files, additional information about filenames
-#             and function names needs to be present in the assembler source
-#             files -- see avr-libc docs [FIXME: not yet described there]
-ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs
-
+ASFLAGS += -Wa,-adhlns=$(<:.S=.lst),-gstabs -mmcu=$(MCU)
+ASFLAGS += -x assembler-with-cpp
 
 #---------------- Library Options ----------------
 # Minimalistic printf version
@@ -137,7 +44,6 @@ PRINTF_LIB =
 #PRINTF_LIB = $(PRINTF_LIB_MIN)
 #PRINTF_LIB = $(PRINTF_LIB_FLOAT)
 
-
 # Minimalistic scanf version
 SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min
 
@@ -149,33 +55,8 @@ SCANF_LIB =
 #SCANF_LIB = $(SCANF_LIB_MIN)
 #SCANF_LIB = $(SCANF_LIB_FLOAT)
 
-
-MATH_LIB = -lm
-
-
-#---------------- External Memory Options ----------------
-
-# 64 KB of external RAM, starting after internal RAM (ATmega128!),
-# used for variables (.data/.bss) and heap (malloc()).
-#EXTMEMOPTS = -Wl,-Tdata=0x801100,--defsym=__heap_end=0x80ffff
-
-# 64 KB of external RAM, starting after internal RAM (ATmega128!),
-# only used for heap (malloc()).
-#EXTMEMOPTS = -Wl,--defsym=__heap_start=0x801100,--defsym=__heap_end=0x80ffff
-
-EXTMEMOPTS =
-
-
-
-#---------------- Linker Options ----------------
-#  -Wl,...:     tell GCC to pass this to linker.
-#    -Map:      create map file
-#    --cref:    add cross reference to  map file
-LDFLAGS =  $(BOOT_LDFLAGS) -Wl,-Map=$(TARGET).map,--cref
-LDFLAGS += $(EXTMEMOPTS)
-LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
-
-
+LDFLAGS =  -Wl,-Map=$(@:.elf=.map),--cref
+LIBS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
 
 #---------------- Programming Options (avrdude) ----------------
 
@@ -185,16 +66,11 @@ LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
 # Type: avrdude -c ?
 # to get a full listing.
 #
-
 AVRDUDE_PROGRAMMER ?= avrisp2
 
-
 # com1 = serial port. Use lpt1 to connect to parallel port.
 AVRDUDE_PORT ?= usb
 
-AVRDUDE_WRITE_FLASH =  -U flash:w:$(TARGET).hex
-#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep
-
 AVRDUDE_WRITE_FUSES = -U lfuse:w:${LFUSE}:m -U hfuse:w:${HFUSE}:m \
 	 -U efuse:w:${EFUSE}:m
 
@@ -216,40 +92,7 @@ AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
 AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
 AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)
 AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
-AVRDUDE_FLAGS += -B 20
-
-
-#---------------- Debugging Options ----------------
-
-# For simulavr only - target MCU frequency.
-DEBUG_MFREQ = $(F_CPU)
-
-# Set the DEBUG_UI to either gdb or insight.
-# DEBUG_UI = gdb
-DEBUG_UI = insight
-
-# Set the debugging back-end to either avarice, simulavr.
-DEBUG_BACKEND = avarice
-#DEBUG_BACKEND = simulavr
-
-# GDB Init Filename.
-GDBINIT_FILE = __avr_gdbinit
-
-# When using avarice settings for the JTAG
-JTAG_DEV = /dev/com1
-
-# Debugging port used to communicate between GDB / avarice / simulavr.
-DEBUG_PORT = 4242
-
-# Debugging host used to communicate between GDB / avarice / simulavr, normally
-#     just set to localhost unless doing some sort of crazy debugging when
-#     avarice is running on a different computer.
-DEBUG_HOST = localhost
-
-
-
-#============================================================================
-
+AVRDUDE_FLAGS += -B 5
 
 # Define programs and commands.
 SHELL = sh
@@ -259,235 +102,133 @@ OBJDUMP = avr-objdump
 SIZE = avr-size
 NM = avr-nm
 AVRDUDE = avrdude
-REMOVE = rm -rf
-COPY = cp
-WINSHELL = cmd
-
-
-# Define Messages
-# English
-MSG_ERRORS_NONE = Errors: none
-MSG_BEGIN = -------- begin --------
-MSG_END = --------  end  --------
-MSG_SIZE_BEFORE = Size before:
-MSG_SIZE_AFTER = Size after:
-MSG_COFF = Converting to AVR COFF:
-MSG_EXTENDED_COFF = Converting to AVR Extended COFF:
-MSG_FLASH = Creating load file for Flash:
-MSG_EEPROM = Creating load file for EEPROM:
-MSG_EXTENDED_LISTING = Creating Extended Listing:
-MSG_SYMBOL_TABLE = Creating Symbol Table:
-MSG_LINKING = Linking:
-MSG_COMPILING = Compiling:
-MSG_ASSEMBLING = Assembling:
-MSG_CLEANING = Cleaning project:
-
-
-# Define all object files.
-OBJ = $(SRC:.c=.o) $(ASRC:.S=.o)
-
-# Define all listing files.
-LST = $(SRC:.c=.lst) $(ASRC:.S=.lst)
-
-
-# Compiler flags to generate dependency files.
-GENDEPFLAGS = -MD -MP -MF .dep/$(@F).d
-
-
-# Combine all necessary flags and optional flags.
-# Add target processor to flags.
-ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) $(GENDEPFLAGS)
-ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
-
-
-# Default target.
-all: begin gccversion sizebefore build sizeafter end
-
-build: elf hex eep lss sym
-
-elf: $(TARGET).elf
-hex: $(TARGET).hex
-eep: $(TARGET).eep
-lss: $(TARGET).lss
-sym: $(TARGET).sym
-
-
-# Eye candy.
-# AVR Studio 3.x does not check make's exit code but relies on
-# the following magic strings to be generated by the compile job.
-begin:
-	@echo
-	@echo $(MSG_BEGIN)
-
-end:
-	@echo $(MSG_END)
-	@echo
-
-
-# Display size of file.
-HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex
-ELFSIZE = $(SIZE) -A $(TARGET).elf
-AVRMEM = avr-mem.sh $(TARGET).elf $(MCU)
-
-sizebefore:
-	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \
-	$(AVRMEM) 2>/dev/null; echo; fi
-
-sizeafter:
-	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \
-	$(AVRMEM) 2>/dev/null; echo; fi
-
-
+RM = rm -rf
 
-# Display compiler version information.
-gccversion :
-	@$(CC) --version
+define SELECT_DEFAULT_template =
+elf: $(1).elf
+hex: $(1).hex
+eep: $(1).eep
+lss: $(1).lss
+sym: $(1).sym
+clean: $(1)_clean
+build: $(1)_build
+program: $(1)_program
+fuses: $(1)_fuses
+endef
 
+all: build
 
+cleanall: $(foreach prog, $(PROGRAMS), $(prog)_clean)
+buildall: $(foreach prog, $(PROGRAMS), $(prog)_build)
 
-# Program the device.
-program: $(TARGET).hex $(TARGET).eep
-	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)
-
-fuses:
-	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FUSES)
-
-# Generate avr-gdb config/init file which does the following:
-#     define the reset signal, load the target file, connect to target, and set
-#     a breakpoint at main().
-gdb-config:
-	@$(REMOVE) $(GDBINIT_FILE)
-	@echo define reset >> $(GDBINIT_FILE)
-	@echo SIGNAL SIGHUP >> $(GDBINIT_FILE)
-	@echo end >> $(GDBINIT_FILE)
-	@echo file $(TARGET).elf >> $(GDBINIT_FILE)
-	@echo target remote $(DEBUG_HOST):$(DEBUG_PORT)  >> $(GDBINIT_FILE)
-ifeq ($(DEBUG_BACKEND),simulavr)
-	@echo load  >> $(GDBINIT_FILE)
-endif
-	@echo break main >> $(GDBINIT_FILE)
-
-debug: gdb-config $(TARGET).elf
-ifeq ($(DEBUG_BACKEND), avarice)
-	@echo Starting AVaRICE - Press enter when "waiting to connect" message displays.
-	@$(WINSHELL) /c start avarice --jtag $(JTAG_DEV) --erase --program --file \
-	$(TARGET).elf $(DEBUG_HOST):$(DEBUG_PORT)
-	@$(WINSHELL) /c pause
-
-else
-	@$(WINSHELL) /c start simulavr --gdbserver --device $(MCU) --clock-freq \
-	$(DEBUG_MFREQ) --port $(DEBUG_PORT)
-endif
-	@$(WINSHELL) /c start avr-$(DEBUG_UI) --command=$(GDBINIT_FILE)
-
-
-# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
-COFFCONVERT=$(OBJCOPY) --debugging \
---change-section-address .data-0x800000 \
---change-section-address .bss-0x800000 \
---change-section-address .noinit-0x800000 \
---change-section-address .eeprom-0x810000
-
-
-coff: $(TARGET).elf
-	@echo
-	@echo $(MSG_COFF) $(TARGET).cof
-	$(COFFCONVERT) -O coff-avr $< $(TARGET).cof
-
-
-extcoff: $(TARGET).elf
-	@echo
-	@echo $(MSG_EXTENDED_COFF) $(TARGET).cof
-	$(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof
-
+.PHONY: clean build program cleanall buildall all
 
+$(eval $(call SELECT_DEFAULT_template, $(PROG)))
 
 # Create final output files (.hex, .eep) from ELF output file.
 %.hex: %.elf
-	@echo
-	@echo $(MSG_FLASH) $@
-	$(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
+	@echo HEX $@
+	$(Q)$(OBJCOPY) -O ihex -R .fuse -R .eeprom $< $@
 
 %.eep: %.elf
-	@echo
-	@echo $(MSG_EEPROM) $@
-	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	--change-section-lma .eeprom=0 -O $(FORMAT) $< $@
+	@echo EEP $@
+	$(Q)$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
+	--change-section-lma .eeprom=0 -O ihex $< $@
 
 # Create extended listing file from ELF output file.
 %.lss: %.elf
-	@echo
-	@echo $(MSG_EXTENDED_LISTING) $@
-	$(OBJDUMP) -h -S $< > $@
+	@echo LSS $@
+	$(Q)$(OBJDUMP) -h -S $< > $@
 
 # Create a symbol table from ELF output file.
 %.sym: %.elf
-	@echo
-	@echo $(MSG_SYMBOL_TABLE) $@
-	$(NM) -n $< > $@
-
-
+	@echo SYM $@
+	$(Q)$(NM) -n $< > $@
 
 # Link: create ELF output file from object files.
-.SECONDARY : $(TARGET).elf
-.PRECIOUS : $(OBJ)
 %.elf: $(OBJ)
-	@echo
-	@echo $(MSG_LINKING) $@
-	$(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS)
-
+	@echo LD $@
+	$(Q)$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
 
 # Compile: create object files from C source files.
-%.o : %.c Makefile
-	@echo
-	@echo $(MSG_COMPILING) $<
-	$(CC) -c $(ALL_CFLAGS) $< -o $@
-
+$(BUILD_DIR)/%.o : %.c Makefile $(wildcard mk/hw/*)
+	@echo CC $@
+	@mkdir -p $(@D)
+	$(Q)$(CC) -c $(CFLAGS) $< -o $@
 
 # Compile: create assembler files from C source files.
 %.s : %.c Makefile
-	$(CC) -S $(ALL_CFLAGS) $< -o $@
-
+	@echo CC-ASM $<
+	$(Q)$(CC) -S $(CFLAGS) $< -o $@
 
 # Assemble: create object files from assembler source files.
 %.o : %.S
-	@echo
-	@echo $(MSG_ASSEMBLING) $<
-	$(CC) -c $(ALL_ASFLAGS) $< -o $@
-
-# Create preprocessed source for use in sending a bug report.
-%.i : %.c
-	$(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@
-
+	@echo ASM $@
+	@mkdir -p $(@D)
+	$(Q)$(CC) -c $(ASFLAGS) $< -o $@
+
+########################### The big template for each program ##################
+define PROGRAM_template= 
+
+$(1)_mupf:
+	@echo "$(1) Objects: " $$($(1)_OBJS)
+	
+# Determine program's object files
+$(1)_OBJS=$$(foreach obj, $$($(1)_SRC:.c=.o), $(BUILD_DIR)/$$(obj))
+$(1)_OBJS+=$$($(1)_ASRC:.S=.o)
+
+# Collect all listing files - for cleanup
+$(1)_LST += $$($(1)_SRC:.c=.lst) $$($(1)_ASRC:.S=.lst)
+
+$(1): $(1).elf
+$(1).elf: $$($(1)_OBJS)
+
+$(1)_program : $(1).hex $(1).eep
+	@echo PROG $(1)
+	$(Q)$(AVRDUDE) $(AVRDUDE_FLAGS) -U flash:w:$(1).hex -U eeprom:w:$(1).eep
+
+$(1)_fuses.bin: $(1).elf
+	@echo OBJCOPY $$@
+	$(Q)$(OBJCOPY) -j .fuse $(1).elf -O binary $$@
+	$(Q)chmod -x $$@
+
+$(1)_fuses: $(1)_fuses.bin
+	@echo FUSES $$@
+	$(Q)$(AVRDUDE) $(AVRDUDE_FLAGS)\
+	-U lfuse:w:0x$$$$(hd $(1)_fuses.bin| awk '{print $$$$2}'):m \
+	-U hfuse:w:0x$$$$(hd $(1)_fuses.bin| awk '{print $$$$3}'):m \
+	-U efuse:w:0x$$$$(hd $(1)_fuses.bin| head -n1 |awk '{print $$$$4}'):m
+
+$(1)_size: $(1).elf
+	@echo; echo
+	$(Q) $(SIZE) -A $(1).elf
 
 # Target: clean project.
-clean: begin clean_list end
-
-clean_list :
-	@echo
-	@echo $(MSG_CLEANING)
-	$(REMOVE) $(TARGET).hex
-	$(REMOVE) $(TARGET).eep
-	$(REMOVE) $(TARGET).cof
-	$(REMOVE) $(TARGET).elf
-	$(REMOVE) $(TARGET).map
-	$(REMOVE) $(TARGET).sym
-	$(REMOVE) $(TARGET).lss
-	$(REMOVE) $(OBJ)
-	$(REMOVE) $(LST)
-	$(REMOVE) $(SRC:.c=.s)
-	$(REMOVE) $(SRC:.c=.d)
-	$(REMOVE) .dep
-	$(REMOVE) *~
-
-
-
-# Include the dependency files.
--include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
-
-
-# Listing of phony targets.
-.PHONY : all begin finish end sizebefore sizeafter gccversion \
-build elf hex eep lss sym coff extcoff \
-clean clean_list program debug gdb-config
-
+$(1)_clean:
+	@echo CLEAN $(1)
+	$(Q)$(RM) $(1).hex
+	$(Q)$(RM) $(1).eep
+	$(Q)$(RM) $(1).cof
+	$(Q)$(RM) $(1).elf
+	$(Q)$(RM) $(1).map
+	$(Q)$(RM) $(1).sym
+	$(Q)$(RM) $(1).lss
+	$(Q)$(RM) $$($(1)_OBJS)
+	$(Q)$(RM) $$($(1)_LST)
+	$(Q)$(RM) $$($(1)_SRC:.c=.s)
+	$(Q)$(RM) $$($(1)_SRC:.c=.d)
+	$(Q)$(RM) $(1)_fuses.bin
+	$(Q) rm -rf $(BUILD_DIR)/
+
+$(1)_build: $(1).hex $(1)_size
+
+-include $$($(1)_OBJS:.o=.d)
+
+.PRECIOUS : $$($(1)_OBJS)
+.PHONY: $(1) $(1)_clean $(1)_size $(1)_build
+
+#############
+endef
+################################################################################
+
+$(foreach prog,$(PROGRAMS),$(eval $(call PROGRAM_template,$(prog))))