Reworked bootloader code

CREDITS

@@ -10,3 +10,7 @@ The fields are: name (N), email (E), web-address (W), description (D).
 N: Tormod Volden
 E: [email protected]
 D: Fixes for DFU compliance
+
+N: Andrew 'Necromant' Andrianov
+E: [email protected]
+D: Portability, cleanups, buildsystem tweeks

Makefile

@@ -1,249 +1,114 @@
-# Makefile skeleton adapted from Peter Harrison's - www.micromouse.com
+CROSS_COMPILE?=arm-ncrmnt-eabi-
+SRCDIR=.
+OBJDIR=./build
 
-# MCU name and submodel
 MCU      = cortex-m3
 SUBMDL   = stm32f103
-
-# toolchain (using code sourcery now)
-TCHAIN = arm-none-eabi
 THUMB    = -mthumb
 THUMB_IW = -mthumb-interwork
 
-# Target file name (without extension).
-BUILDDIR = build
-TARGET = $(BUILDDIR)/maple_boot
-
-ST_LIB = stm32_lib
-ST_USB = usb_lib
-
-# Optimization level [0,1,2,3,s]
-OPT = 0
-DEBUG = -g
-#DEBUG = dwarf-2
+TARGET=$(OBJDIR)/ucboot-$(BOARD)
 
-INCDIRS = ./$(ST_LIB) ./$(ST_USB)
-
-CFLAGS = $(DEBUG)
+OPT=s
+DEBUG=
 CFLAGS += -O$(OPT)
 CFLAGS += -ffunction-sections -fdata-sections
 CFLAGS += -Wall -Wimplicit
-CFLAGS += -Wcast-align
 CFLAGS += -Wpointer-arith -Wswitch
 CFLAGS += -Wredundant-decls -Wreturn-type -Wshadow -Wunused
-CFLAGS += -Wa,-adhlns=$(BUILDDIR)/$(subst $(suffix $<),.lst,$<)
-CFLAGS += $(patsubst %,-I%,$(INCDIRS))
+CFLAGS += -Wa,-adhlns=$(OBJDIR)/$(subst $(suffix $<),.lst,$<)
+CFLAGS += -I$(OBJDIR)/
 
-# Aeembler Flags
-ASFLAGS = -Wa,-adhlns=$(BUILDDIR)/$(<:.s=.lst)#,--g$(DEBUG)
+GENDEPFLAGS = -MD -MP -MF $(@).d
 
+CFLAGS += -mcpu=$(MCU) $(THUMB) $(THUMB_IW) $(GENDEPFLAGS)
+ASFLAGS = -Wa,-adhlns=$(OBJDIR)/$(<:.s=.lst)#,--g$(DEBUG)
+ASFLAGS += -mcpu=$(MCU) $(THUMB) $(THUMB_IW) -x assembler-with-cpp
+ASFLAGS += $(GENDEPFLAGS)
 LDFLAGS = -nostartfiles -Wl,-Map=$(TARGET).map,--cref,--gc-sections
 LDFLAGS += -lc -lgcc
-
-# Set the linker script
-LDFLAGS +=-T$(ST_LIB)/c_only_md.ld
-
-# Define programs and commands.
-SHELL = sh
-CC = $(TCHAIN)-gcc
-CPP = $(TCHAIN)-g++
-AR = $(TCHAIN)-ar
-OBJCOPY = $(TCHAIN)-objcopy
-OBJDUMP = $(TCHAIN)-objdump
-SIZE = $(TCHAIN)-size
-NM = $(TCHAIN)-nm
-REMOVE = rm -f
-REMOVEDIR = rm -r
-COPY = cp
-
-# Define Messages
-# English
-MSG_ERRORS_NONE = Errors: none
-MSG_BEGIN = "-------- begin --------"
-MSG_ETAGS = Created TAGS File
-MSG_END = --------  end  --------
-MSG_SIZE_BEFORE = Size before:
-MSG_SIZE_AFTER = Size after:
-MSG_FLASH = Creating load file for Flash:
-MSG_EXTENDED_LISTING = Creating Extended Listing:
-MSG_SYMBOL_TABLE = Creating Symbol Table:
-MSG_LINKING = Linking:
-MSG_COMPILING = Compiling C:
-MSG_ASSEMBLING = Assembling:
-MSG_CLEANING = Cleaning project:
-
-# Combine all necessary flags and optional flags.
-# Add target processor to flags.
-GENDEPFLAGS = -MD -MP -MF .dep/$(@F).d
-ALL_CFLAGS  = -mcpu=$(MCU) $(THUMB_IW) -I. $(CFLAGS) $(GENDEPFLAGS)
-ALL_ASFLAGS = -mcpu=$(MCU) $(THUMB_IW) -I. -x assembler-with-cpp $(ASFLAGS)
-
-# --------------------------------------------- #
-# file management
-ASRC = $(ST_LIB)/c_only_startup.s $(ST_LIB)/cortexm3_macro.s
-
-STM32SRCS = 
-
-_STM32USBSRCS = usb_regs.c \
-usb_int.c \
-usb_init.c \
-usb_core.c \
-usb_mem.c
-
-STM32USBSRCS = $(patsubst %, $(ST_USB)/%,$(_STM32USBSRCS))
-
-SRCS = usb.c usb_callbacks.c usb_descriptor.c main.c hardware.c dfu.c
-
-
-SRC = $(SRCS) $(STM32SRCS) $(STM32USBSRCS)
-
-# Define all object files.
-_COBJ =  $(SRC:.c=.o)
-_AOBJ =  $(ASRC:.s=.o)
-COBJ = $(patsubst %, $(BUILDDIR)/%,$(_COBJ))
-AOBJ = $(patsubst %, $(BUILDDIR)/%,$(_AOBJ))
-
-# Define all listing files.
-_LST  =  $(ASRC:.s=.lst)
-_LST +=  $(SRC:.c=.lst)
-LST = $(patsubst %, $(BUILDDIR)/%,$(_LST))
-
-# Display size of file.
-HEXSIZE = $(SIZE) --target=binary $(TARGET).hex
-ELFSIZE = $(SIZE) -A $(TARGET).elf
-
-# go!
-all: begin gccversion build sizeafter finished end
-build: elf bin lss sym
-
-bin: $(TARGET).bin
-elf: $(TARGET).elf
-lss: $(TARGET).lss 
-sym: $(TARGET).sym
-dfu: $(TARGET).bin
-	sudo dfu-util -d 0110:1001 -a 0 -D $(TARGET).bin
-
-begin:
-	mkdir -p build/stm32_lib
-	mkdir -p build/usb_lib
-	@echo --
-	@echo $(MSG_BEGIN)
-	@echo $(COBJ)
-
-finished:
-	@echo $(MSG_ERRORS_NONE)
-tags:
-	etags `find . -name "*.c" -o -name "*.cpp" -o -name "*.h"`
-	@echo $(MSG_ETAGS)
-end:
-	@echo $(MSG_END)
-	@echo
-sizeafter:
-	@if [ -f $(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); echo; fi
-gccversion: 
-	@$(CC) --version
-
-program: 
-	@echo "Flash-programming with OpenOCD"
-	cp $(TARGET).bin flash/tmpflash.bin
-	cd flash && openocd -f flash.cfg
-
-program_serial: 
-	@echo "Flash-programming with stm32loader.py"
-	./flash/stm32loader.py -p /dev/ttyUSB0 -evw build/maple_boot.bin
-
-debug: $(TARGET).bin
-	@echo "Flash-programming with OpenOCD - DEBUG"
-	cp $(TARGET).bin flash/tmpflash.bin
-	cd flash && openocd -f debug.cfg
-
-install: $(TARGET).bin
-	cp $(TARGET).bin build/main.bin
-	openocd -f flash/perry_flash.cfg
-
-run: $(TARGET).bin
-	openocd -f flash/run.cfg
-
-# Create final output file (.hex) from ELF output file.
-%.hex: %.elf
-	@echo
-	@echo $(MSG_FLASH) $@
-	$(OBJCOPY) -O binary $< $@
-
-# Create final output file (.bin) from ELF output file.
-%.bin: %.elf
-	@echo
-	@echo $(MSG_FLASH) $@
-	$(OBJCOPY) -O binary $< $@
-
-
-# Create extended listing file from ELF output file.
-# testing: option -C
-%.lss: %.elf
-	@echo
-	@echo $(MSG_EXTENDED_LISTING) $@
-	$(OBJDUMP) -h -S -D $< > $@
-
-
-# Create a symbol table from ELF output file.
-%.sym: %.elf
-	@echo
-	@echo $(MSG_SYMBOL_TABLE) $@
-	$(NM) -n $< > $@
-
-
-# Link: create ELF output file from object files.
-.SECONDARY : $(TARGET).elf 
-.PRECIOUS : $(COBJ) $(AOBJ)
-
-%.elf:  $(COBJ) $(AOBJ)
-	@echo
-	@echo $(MSG_LINKING) $@
-	$(CC) $(THUMB) $(ALL_CFLAGS) $(AOBJ) $(COBJ) --output $@ $(LDFLAGS)
-
-# Compile: create object files from C source files. ARM/Thumb
-$(COBJ) : $(BUILDDIR)/%.o : %.c
-	@echo
-	@echo $(MSG_COMPILING) $<
-	$(CC) -c $(THUMB) $(ALL_CFLAGS) $< -o $@ 
-
-# Assemble: create object files from assembler source files. ARM/Thumb
-$(AOBJ) : $(BUILDDIR)/%.o : %.s
-	@echo
-	@echo $(MSG_ASSEMBLING) $<
-	$(CC) -c $(THUMB) $(ALL_ASFLAGS) $< -o $@
-
-clean: begin clean_list finished end
-
-clean_list :
-	@echo
-	@echo $(MSG_CLEANING)
-	$(REMOVE) $(TARGET).hex
-	$(REMOVE) $(TARGET).bin
-	$(REMOVE) $(TARGET).obj
-	$(REMOVE) $(TARGET).elf
-	$(REMOVE) $(TARGET).map
-	$(REMOVE) $(TARGET).obj
-	$(REMOVE) $(TARGET).a90
-	$(REMOVE) $(TARGET).sym
-	$(REMOVE) $(TARGET).lnk
-	$(REMOVE) $(TARGET).lss
-	$(REMOVE) $(COBJ)
-	$(REMOVE) $(AOBJ)
-	$(REMOVE) $(LST)
-	$(REMOVE) flash/tmpflash.bin
-#	$(REMOVE) $(SRC:.c=.s)
-#	$(REMOVE) $(SRC:.c=.d)
-	$(REMOVE) .dep/*
-
-# Include the dependency files.
--include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
-
-
-# Listing of phony targets.
-.PHONY : all begin finish tags end sizeafter gccversion \
-build elf hex bin lss sym clean clean_list program cscope
-
-cscope:
-	rm -rf *.cscope
-	find . -iname "*.[hcs]" | grep -v examples | xargs cscope -R -b
-
+#TODO:...
+LDFLAGS +=-T$(SRCDIR)/src/startup/c_only_md.ld
+
+CROSS_CC=$(CROSS_COMPILE)gcc
+CROSS_AS=$(CROSS_COMPILE)as
+CROSS_LD=$(CROSS_COMPILE)ld
+CROSS_OBJCOPY=$(CROSS_COMPILE)objcopy
+CROSS_OBJDUMP=$(CROSS_COMPILE)objdump
+
+# Pretty colors
+tb_ylw=$(shell echo -e '\e[1;33m')
+tb_blu=$(shell echo -e '\e[1;34m')
+tb_pur=$(shell echo -e '\e[1;35m')
+col_rst=$(shell echo -e '\e[0m')
+tb_grn=$(shell echo -e '\e[1;32m')
+
+ifneq ($(V),y)
+   SILENT_CC       = @echo '  $(tb_ylw)[CC]$(col_rst)       ' $(@F);
+   SILENT_AS       = @echo '  $(tb_blu)[AS]$(col_rst)       ' $(@F);
+   SILENT_LD       = @echo '  $(tb_pur)[LD]$(col_rst)       ' $(@F);
+   SILENT_OBJCOPY  = @echo '  $(tb_pur)[OBJCOPY]$(col_rst)  ' $(@F);
+   SILENT_OBJDUMP  = @echo '  $(tb_pur)[OBJDUMP]$(col_rst)  ' $(OBJDUMP);
+   SILENT_INFO     = @echo '  $(tb_grn)[INFO]$(col_rst)	Build for board $(tb_grn)$(BOARD)$(col_rst) complete';
+   #Shut up this crap
+   MAKEFLAGS+=--no-print-directory
+endif
+
+# This is a dirty hack, since I don't want to
+# recurse properly into dirs with recusive make invocation
+# and the only method of reading submakes descending into subdirs,
+# without recusive invocation I came up with looks like shit
+# Anyway, this would be a bit too much for such a project
+
+define suck_directory
+-include $(SRCDIR)/$(1)/Makefile
+mkdirs+=$(OBJDIR)/$(1)
+objects+=$$(addprefix $(OBJDIR)/$(1)/,$$(objects-$(2)))
+endef
+
+$(eval $(call suck_directory,src/common,common))
+$(eval $(call suck_directory,src/usb_lib,usb_lib))
+$(eval $(call suck_directory,src/startup,startup))
+$(eval $(call suck_directory,boards/$(BOARD),y))
+
+all:
+	@$(foreach d,$(shell ls $(SRCDIR)/boards/),make BOARD=$(d) build;)
+
+-include $(addsuffix .d,$(objects))
+
+$(OBJDIR)/%.o: $(SRCDIR)/%.c
+	$(SILENT_CC) $(CROSS_CC) $(CFLAGS)  -c  -o $(@) $<
+
+$(OBJDIR)/%.o: $(SRCDIR)/%.S
+	$(SILENT_AS) $(CROSS_CC) $(ASFLAGS) -c -o $(@) $<
+
+$(OBJDIR)/%.o: $(SRCDIR)/%.s
+	$(SILENT_AS) $(CROSS_CC) $(ASFLAGS) -c -o $(@) $<
+
+$(OBJDIR)/%.elf: $(objects)
+	$(SILENT_LD) $(CROSS_CC) $(CFLAGS) --output $(@) $(LDFLAGS) $(objects)
+
+$(OBJDIR)/%.bin: $(OBJDIR)/%.elf
+	$(SILENT_OBJCOPY) $(CROSS_OBJCOPY) -O binary $< $@
+
+#config.h symlink voodoo ensures we'll get stuff properly rebuilt
+warmup:
+	@mkdir -p $(OBJDIR)
+	@$(foreach d,$(mkdirs),mkdir -p $(d);)
+	@ln -sf $(abspath $(SRCDIR)/boards/$(BOARD)/config.h) $(OBJDIR)/config.h
+	@touch $(OBJDIR)/config.h
+
+build: warmup $(OBJDIR)/ucboot-$(BOARD).bin
+	$(SILENT_INFO)
+
+clean:
+	@rm -Rfv $(OBJDIR)
+help:
+	@echo "To build for a board, run 'make BOARD=boardname build'"
+	@echo "To build for all avaliable boards run make"
+	@echo "Use CROSS_COMPILE to set toolchain prefix"
+	@echo "USE V=y for verbose build"
+	@echo "Have fun"
+
+.PRECIOUS: $(objects) $(TARGET).bin $(TARGET).elf
+.PHONY: warmup