New build system for GCC ARM ports.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3428 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-10-08 09:22:34 +00:00 · 2011-10-08 09:22:34 +00:00 · 538f257a67
parent 1351fded5a
commit 538f257a67
50 changed files with 371 additions and 251 deletions
--- a/boards/OLIMEX_LPC_P2148/board.mk
+++ b/boards/OLIMEX_LPC_P2148/board.mk
@ -1,8 +1,5 @@
-# Board directory path
-BOARDPATH = ${CHIBIOS}/boards/OLIMEX_LPC_P2148/
-
 # List of all the mandatory board related files.
-BOARDSRC = ${BOARDPATH}/board.c
+BOARDSRC = ${CHIBIOS}/boards/OLIMEX_LPC_P2148/board.c

 # Required include directories
-BOARDINC = ${BOARDPATH}
+BOARDINC = ${CHIBIOS}/boards/OLIMEX_LPC_P2148
--- a/demos/ARM7-AT91SAM7S-FATFS-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7S-FATFS-GCC/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = no
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARM7-AT91SAM7S-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7S-GCC/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = no
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARM7-AT91SAM7X-FATFS-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-FATFS-GCC/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = no
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARM7-AT91SAM7X-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-GCC/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = no
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARM7-AT91SAM7X-LWIP-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-LWIP-GCC/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = no
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARM7-AT91SAM7X-UIP-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-UIP-GCC/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = no
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARM7-LPC214x-FATFS-GCC/Makefile
+++ b/demos/ARM7-LPC214x-FATFS-GCC/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = no
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARM7-LPC214x-G++/Makefile
+++ b/demos/ARM7-LPC214x-G++/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = no
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARM7-LPC214x-GCC/Makefile
+++ b/demos/ARM7-LPC214x-GCC/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = no
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARMCM0-LPC1114-LPCXPRESSO/Makefile
+++ b/demos/ARMCM0-LPC1114-LPCXPRESSO/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARMCM3-GENERIC-KERNEL/Makefile
+++ b/demos/ARMCM3-GENERIC-KERNEL/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARMCM3-LPC1343-LPCXPRESSO/Makefile
+++ b/demos/ARMCM3-LPC1343-LPCXPRESSO/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARMCM3-STM32F100-DISCOVERY/Makefile
+++ b/demos/ARMCM3-STM32F100-DISCOVERY/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARMCM3-STM32F103-FATFS/Makefile
+++ b/demos/ARMCM3-STM32F103-FATFS/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARMCM3-STM32F103-G++/Makefile
+++ b/demos/ARMCM3-STM32F103-G++/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARMCM3-STM32F103/Makefile
+++ b/demos/ARMCM3-STM32F103/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARMCM3-STM32F103ZG-FATFS/Makefile
+++ b/demos/ARMCM3-STM32F103ZG-FATFS/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARMCM3-STM32F107/Makefile
+++ b/demos/ARMCM3-STM32F107/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/demos/ARMCM3-STM32L152-DISCOVERY/Makefile
+++ b/demos/ARMCM3-STM32L152-DISCOVERY/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/os/ports/GCC/ARM/AT91SAM7/port.mk
+++ b/os/ports/GCC/ARM/AT91SAM7/port.mk
@ -5,9 +5,7 @@ PORTASM = ${CHIBIOS}/os/ports/GCC/ARM/crt0.s \
          ${CHIBIOS}/os/ports/GCC/ARM/chcoreasm.s \
          ${CHIBIOS}/os/ports/GCC/ARM/AT91SAM7/vectors.s

-
 PORTINC = ${CHIBIOS}/os/ports/GCC/ARM \
          ${CHIBIOS}/os/ports/GCC/ARM/AT91SAM7

 PORTLD  = ${CHIBIOS}/os/ports/GCC/ARM/AT91SAM7/ld
-
--- a/os/ports/GCC/ARM/LPC214x/port.mk
+++ b/os/ports/GCC/ARM/LPC214x/port.mk
@ -5,9 +5,7 @@ PORTASM = ${CHIBIOS}/os/ports/GCC/ARM/crt0.s \
          ${CHIBIOS}/os/ports/GCC/ARM/chcoreasm.s \
          ${CHIBIOS}/os/ports/GCC/ARM/LPC214x/vectors.s

-
 PORTINC = ${CHIBIOS}/os/ports/GCC/ARM \
          ${CHIBIOS}/os/ports/GCC/ARM/LPC214x

 PORTLD  = ${CHIBIOS}/os/ports/GCC/ARM/LPC214x/ld
-
--- a/os/ports/GCC/ARM/rules.mk
+++ b/os/ports/GCC/ARM/rules.mk
@ -1,26 +1,23 @@
 # ARM7/9 common makefile scripts and rules.

-# Output
-OUTFILES = $(BUILDDIR)/$(PROJECT).elf $(BUILDDIR)/$(PROJECT).hex $(BUILDDIR)/$(PROJECT).bin $(BUILDDIR)/$(PROJECT).dmp
+# Output directory and files
 ifeq ($(BUILDDIR),)
-  BUILDDIR = .
-  CLEANDIR =
-else
-  CLEANDIR = $(BUILDDIR)
+  BUILDDIR = build
 endif
-ENSUREBUILDDIR = $(shell test -d $(BUILDDIR) || mkdir $(BUILDDIR))
+ifeq ($(BUILDDIR),.)
+  BUILDDIR = build
+endif
+OUTFILES = $(BUILDDIR)/$(PROJECT).elf $(BUILDDIR)/$(PROJECT).hex \
+           $(BUILDDIR)/$(PROJECT).bin $(BUILDDIR)/$(PROJECT).dmp

 # Automatic compiler options
 OPT = $(USE_OPT)
 CPPOPT = $(USE_CPPOPT)
-ifeq ($(USE_CURRP_CACHING),yes)
-  OPT += -ffixed-r7 -DCH_CURRP_REGISTER_CACHE='"r7"'
-endif
 ifeq ($(USE_LINK_GC),yes)
  OPT += -ffunction-sections -fdata-sections
 endif

-# Source files groups
+# Source files groups and paths
 ifeq ($(USE_THUMB),yes)
  TCSRC += $(CSRC)
  TCPPSRC += $(CPPSRC)
@ -28,35 +25,39 @@ else
  ACSRC += $(CSRC)
  ACPPSRC += $(CPPSRC)
 endif
-ASRC	 = $(ACSRC)$(ACPPSRC)
-TSRC	 = $(TCSRC)$(TCPPSRC)
-SRC	     = $(ASRC)$(TSRC)
+ASRC	  = $(ACSRC) $(ACPPSRC)
+TSRC	  = $(TCSRC) $(TCPPSRC)
+SRCPATHS  = $(sort $(dir $(ASMSRC)) $(dir $(ASRC)) $(dir $(TSRC)))
+
+# Various directories
+OBJDIR    = $(BUILDDIR)/obj
+LSTDIR    = $(BUILDDIR)/lst

 # Object files groups
-ACOBJS   = $(ACSRC:.c=.o)
-ACPPOBJS = $(ACPPSRC:.cpp=.o)
-TCOBJS   = $(TCSRC:.c=.o)
-TCPPOBJS = $(TCPPSRC:.cpp=.o)
-ASMOBJS  = $(ASMSRC:.s=.o)
-OBJS	 = $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS)
+ACOBJS    = $(addprefix $(OBJDIR)/, $(notdir $(ACSRC:.c=.o)))
+ACPPOBJS  = $(addprefix $(OBJDIR)/, $(notdir $(ACPPSRC:.cpp=.o)))
+TCOBJS    = $(addprefix $(OBJDIR)/, $(notdir $(TCSRC:.c=.o)))
+TCPPOBJS  = $(addprefix $(OBJDIR)/, $(notdir $(TCPPSRC:.cpp=.o)))
+ASMOBJS   = $(addprefix $(OBJDIR)/, $(notdir $(ASMSRC:.s=.o)))
+OBJS	  = $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS)

 # Paths
-IINCDIR = $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR))
-LLIBDIR = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))
+IINCDIR   = $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR))
+LLIBDIR   = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))

 # Macros
-DEFS    = $(DDEFS) $(UDEFS)
-ADEFS   = $(DADEFS) $(UADEFS)
+DEFS      = $(DDEFS) $(UDEFS)
+ADEFS 	  = $(DADEFS) $(UADEFS)

 # Libs
-LIBS    = $(DLIBS) $(ULIBS)
+LIBS      = $(DLIBS) $(ULIBS)

 # Various settings
-MCFLAGS = -mcpu=$(MCU)
-ODFLAGS	= -x --syms
-ASFLAGS = $(MCFLAGS) -Wa,-amhls=$(<:.s=.lst) $(ADEFS)
-CFLAGS   = $(MCFLAGS) $(OPT) $(CWARN) -Wa,-alms=$(<:.c=.lst) $(DEFS)
-CPPFLAGS = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(<:.cpp=.lst) $(DEFS)
+MCFLAGS   = -mcpu=$(MCU)
+ODFLAGS	  = -x --syms
+ASFLAGS   = $(MCFLAGS) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.s=.lst)) $(ADEFS)
+CFLAGS    = $(MCFLAGS) $(OPT) $(CWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.c=.lst)) $(DEFS)
+CPPFLAGS  = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.cpp=.lst)) $(DEFS)
 ifeq ($(USE_LINK_GC),yes)
  LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--gc-sections $(LLIBDIR)
 else
@ -65,80 +66,140 @@ endif

 # Thumb interwork enabled only if needed because it kills performance.
 ifneq ($(TSRC),)
-  CFLAGS += -DTHUMB_PRESENT
+  CFLAGS   += -DTHUMB_PRESENT
  CPPFLAGS += -DTHUMB_PRESENT
-  ASFLAGS += -DTHUMB_PRESENT
+  ASFLAGS  += -DTHUMB_PRESENT
  ifneq ($(ASRC),)
    # Mixed ARM and THUMB mode.
-    CFLAGS += -mthumb-interwork
+    CFLAGS   += -mthumb-interwork
    CPPFLAGS += -mthumb-interwork
-    ASFLAGS += -mthumb-interwork
-    LDFLAGS += -mthumb-interwork
+    ASFLAGS  += -mthumb-interwork
+    LDFLAGS  += -mthumb-interwork
  else
    # Pure THUMB mode, THUMB C code cannot be called by ARM asm code directly.
-    CFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
+    CFLAGS   += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
    CPPFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
-    ASFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb
-    LDFLAGS += -mno-thumb-interwork -mthumb
+    ASFLAGS  += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb
+    LDFLAGS  += -mno-thumb-interwork -mthumb
  endif
 else
  # Pure ARM mode
-  CFLAGS += -mno-thumb-interwork
+  CFLAGS   += -mno-thumb-interwork
  CPPFLAGS += -mno-thumb-interwork
-  ASFLAGS += -mno-thumb-interwork
-  LDFLAGS += -mno-thumb-interwork
+  ASFLAGS  += -mno-thumb-interwork
+  LDFLAGS  += -mno-thumb-interwork
 endif

 # Generate dependency information
-CFLAGS += -MD -MP -MF .dep/$(@F).d
+CFLAGS   += -MD -MP -MF .dep/$(@F).d
 CPPFLAGS += -MD -MP -MF .dep/$(@F).d

+# Paths where to search for sources
+VPATH     = $(SRCPATHS)
+
 #
 # Makefile rules
 #

-all: $(ENSUREBUILDDIR) $(OBJS) $(OUTFILES) MAKE_ALL_RULE_HOOK
+all: $(OBJS) $(OUTFILES) MAKE_ALL_RULE_HOOK

 MAKE_ALL_RULE_HOOK:

-$(ACPPOBJS) : %.o : %.cpp
+$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR)
+
+$(BUILDDIR):
+	@echo $(SRCPATHS)
+	mkdir $(BUILDDIR)
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+$(LSTDIR):
+	mkdir $(LSTDIR)
+
+$(ACPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	@echo
 	$(CPPC) -c $(CPPFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@
+else
+	@echo Compiling $<
+	@$(CPPC) -c $(CPPFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@
+endif

-$(TCPPOBJS) : %.o : %.cpp
+$(TCPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	@echo
 	$(CPPC) -c $(CPPFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@
+else
+	@echo Compiling $<
+	@$(CPPC) -c $(CPPFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@
+endif

-$(ACOBJS) : %.o : %.c
+$(ACOBJS) : $(OBJDIR)/%.o : %.c Makefile
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	@echo
 	$(CC) -c $(CFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@
+else
+	@echo Compiling $<
+	@$(CC) -c $(CFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@
+endif

-$(TCOBJS) : %.o : %.c
+$(TCOBJS) : $(OBJDIR)/%.o : %.c Makefile
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	@echo
 	$(CC) -c $(CFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@
+else
+	@echo Compiling $<
+	@$(CC) -c $(CFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@
+endif

-$(ASMOBJS) : %.o : %.s
+$(ASMOBJS) : $(OBJDIR)/%.o : %.s Makefile
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	@echo
 	$(AS) -c $(ASFLAGS) -I . $(IINCDIR) $< -o $@
+else
+	@echo Compiling $<
+	@$(AS) -c $(ASFLAGS) -I . $(IINCDIR) $< -o $@
+endif

-%elf: $(OBJS)
+%.elf: $(OBJS) $(LDSCRIPT)
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	@echo
 	$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
+else
+	@echo Linking $@
+	@$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
+endif

-%hex: %elf
+%.hex: %.elf $(LDSCRIPT)
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	$(HEX) $< $@
+else
+	@echo Creating $@
+	@$(HEX) $< $@
+endif

-%bin: %elf
+%.bin: %.elf $(LDSCRIPT)
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	$(BIN) $< $@
+else
+	@echo Creating $@
+	@$(BIN) $< $@
+endif

-%dmp: %elf
+%.dmp: %.elf $(LDSCRIPT)
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	$(OD) $(ODFLAGS) $< > $@
+else
+	@echo Creating $@
+	@$(OD) $(ODFLAGS) $< > $@
+	@echo Done
+endif

 clean:
-	-rm -f $(OBJS)
-	-rm -f $(ACSRC:.c=.lst) $(TCSRC:.c=.lst) $(ACPPSRC:.cpp=.lst) $(TCPPSRC:.cpp=.lst) $(ASMSRC:.s=.lst)
-	-rm -f $(OUTFILES) $(BUILDDIR)/$(PROJECT).map
-	-rm -fR .dep $(CLEANDIR)
+	@echo Cleaning
+	-rm -fR .dep $(BUILDDIR)
+	@echo Done

 #
 # Include the dependency files, should be the last of the makefile
--- a/os/ports/GCC/ARMCMx/rules.mk
+++ b/os/ports/GCC/ARMCMx/rules.mk
@ -1,26 +1,23 @@
 # ARM Cortex-Mx common makefile scripts and rules.

-# Output
-OUTFILES = $(BUILDDIR)/$(PROJECT).elf $(BUILDDIR)/$(PROJECT).hex $(BUILDDIR)/$(PROJECT).bin $(BUILDDIR)/$(PROJECT).dmp
+# Output directory and files
 ifeq ($(BUILDDIR),)
-  BUILDDIR = .
-  CLEANDIR =
-else
-  CLEANDIR = $(BUILDDIR)
+  BUILDDIR = build
 endif
-ENSUREBUILDDIR = $(shell test -d $(BUILDDIR) || mkdir $(BUILDDIR))
+ifeq ($(BUILDDIR),.)
+  BUILDDIR = build
+endif
+OUTFILES = $(BUILDDIR)/$(PROJECT).elf $(BUILDDIR)/$(PROJECT).hex \
+           $(BUILDDIR)/$(PROJECT).bin $(BUILDDIR)/$(PROJECT).dmp

 # Automatic compiler options
 OPT = $(USE_OPT)
 CPPOPT = $(USE_CPPOPT)
-ifeq ($(USE_CURRP_CACHING),yes)
-  OPT += -ffixed-r7 -DCH_CURRP_REGISTER_CACHE='"r7"'
-endif
 ifeq ($(USE_LINK_GC),yes)
  OPT += -ffunction-sections -fdata-sections
 endif

-# Source files groups
+# Source files groups and paths
 ifeq ($(USE_THUMB),yes)
  TCSRC += $(CSRC)
  TCPPSRC += $(CPPSRC)
@ -28,35 +25,39 @@ else
  ACSRC += $(CSRC)
  ACPPSRC += $(CPPSRC)
 endif
-ASRC	 = $(ACSRC)$(ACPPSRC)
-TSRC	 = $(TCSRC)$(TCPPSRC)
-SRC	     = $(ASRC)$(TSRC)
+ASRC	  = $(ACSRC) $(ACPPSRC)
+TSRC	  = $(TCSRC) $(TCPPSRC)
+SRCPATHS  = $(sort $(dir $(ASMSRC)) $(dir $(ASRC)) $(dir $(TSRC)))
+
+# Various directories
+OBJDIR    = $(BUILDDIR)/obj
+LSTDIR    = $(BUILDDIR)/lst

 # Object files groups
-ACOBJS   = $(ACSRC:.c=.o)
-ACPPOBJS = $(ACPPSRC:.cpp=.o)
-TCOBJS   = $(TCSRC:.c=.o)
-TCPPOBJS = $(TCPPSRC:.cpp=.o)
-ASMOBJS  = $(ASMSRC:.s=.o)
-OBJS	 = $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS)
+ACOBJS    = $(addprefix $(OBJDIR)/, $(notdir $(ACSRC:.c=.o)))
+ACPPOBJS  = $(addprefix $(OBJDIR)/, $(notdir $(ACPPSRC:.cpp=.o)))
+TCOBJS    = $(addprefix $(OBJDIR)/, $(notdir $(TCSRC:.c=.o)))
+TCPPOBJS  = $(addprefix $(OBJDIR)/, $(notdir $(TCPPSRC:.cpp=.o)))
+ASMOBJS   = $(addprefix $(OBJDIR)/, $(notdir $(ASMSRC:.s=.o)))
+OBJS	  = $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS)

 # Paths
-IINCDIR = $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR))
-LLIBDIR = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))
+IINCDIR   = $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR))
+LLIBDIR   = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))

 # Macros
-DEFS    = $(DDEFS) $(UDEFS)
-ADEFS   = $(DADEFS) $(UADEFS)
+DEFS      = $(DDEFS) $(UDEFS)
+ADEFS 	  = $(DADEFS) $(UADEFS)

 # Libs
-LIBS    = $(DLIBS) $(ULIBS)
+LIBS      = $(DLIBS) $(ULIBS)

 # Various settings
-MCFLAGS = -mcpu=$(MCU)
-ODFLAGS	= -x --syms
-ASFLAGS = $(MCFLAGS) -Wa,-amhls=$(<:.s=.lst) $(ADEFS)
-CFLAGS   = $(MCFLAGS) $(OPT) $(CWARN) -Wa,-alms=$(<:.c=.lst) $(DEFS)
-CPPFLAGS = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(<:.cpp=.lst) $(DEFS)
+MCFLAGS   = -mcpu=$(MCU)
+ODFLAGS	  = -x --syms
+ASFLAGS   = $(MCFLAGS) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.s=.lst)) $(ADEFS)
+CFLAGS    = $(MCFLAGS) $(OPT) $(CWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.c=.lst)) $(DEFS)
+CPPFLAGS  = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.cpp=.lst)) $(DEFS)
 ifeq ($(USE_LINK_GC),yes)
  LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--gc-sections $(LLIBDIR)
 else
@ -65,80 +66,140 @@ endif

 # Thumb interwork enabled only if needed because it kills performance.
 ifneq ($(TSRC),)
-  CFLAGS += -DTHUMB_PRESENT
+  CFLAGS   += -DTHUMB_PRESENT
  CPPFLAGS += -DTHUMB_PRESENT
-  ASFLAGS += -DTHUMB_PRESENT
+  ASFLAGS  += -DTHUMB_PRESENT
  ifneq ($(ASRC),)
    # Mixed ARM and THUMB mode.
-    CFLAGS += -mthumb-interwork
+    CFLAGS   += -mthumb-interwork
    CPPFLAGS += -mthumb-interwork
-    ASFLAGS += -mthumb-interwork
-    LDFLAGS += -mthumb-interwork
+    ASFLAGS  += -mthumb-interwork
+    LDFLAGS  += -mthumb-interwork
  else
    # Pure THUMB mode, THUMB C code cannot be called by ARM asm code directly.
-    CFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
+    CFLAGS   += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
    CPPFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
-    ASFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb
-    LDFLAGS += -mno-thumb-interwork -mthumb
+    ASFLAGS  += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb
+    LDFLAGS  += -mno-thumb-interwork -mthumb
  endif
 else
  # Pure ARM mode
-  CFLAGS += -mno-thumb-interwork
+  CFLAGS   += -mno-thumb-interwork
  CPPFLAGS += -mno-thumb-interwork
-  ASFLAGS += -mno-thumb-interwork
-  LDFLAGS += -mno-thumb-interwork
+  ASFLAGS  += -mno-thumb-interwork
+  LDFLAGS  += -mno-thumb-interwork
 endif

 # Generate dependency information
-CFLAGS += -MD -MP -MF .dep/$(@F).d
+CFLAGS   += -MD -MP -MF .dep/$(@F).d
 CPPFLAGS += -MD -MP -MF .dep/$(@F).d

+# Paths where to search for sources
+VPATH     = $(SRCPATHS)
+
 #
 # Makefile rules
 #

-all: $(ENSUREBUILDDIR) $(OBJS) $(OUTFILES) MAKE_ALL_RULE_HOOK
+all: $(OBJS) $(OUTFILES) MAKE_ALL_RULE_HOOK

 MAKE_ALL_RULE_HOOK:

-$(ACPPOBJS) : %.o : %.cpp
+$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR)
+
+$(BUILDDIR):
+	@echo $(SRCPATHS)
+	mkdir $(BUILDDIR)
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+$(LSTDIR):
+	mkdir $(LSTDIR)
+
+$(ACPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	@echo
 	$(CPPC) -c $(CPPFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@
+else
+	@echo Compiling $<
+	@$(CPPC) -c $(CPPFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@
+endif

-$(TCPPOBJS) : %.o : %.cpp
+$(TCPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	@echo
 	$(CPPC) -c $(CPPFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@
+else
+	@echo Compiling $<
+	@$(CPPC) -c $(CPPFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@
+endif

-$(ACOBJS) : %.o : %.c
+$(ACOBJS) : $(OBJDIR)/%.o : %.c Makefile
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	@echo
 	$(CC) -c $(CFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@
+else
+	@echo Compiling $<
+	@$(CC) -c $(CFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@
+endif

-$(TCOBJS) : %.o : %.c
+$(TCOBJS) : $(OBJDIR)/%.o : %.c Makefile
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	@echo
 	$(CC) -c $(CFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@
+else
+	@echo Compiling $<
+	@$(CC) -c $(CFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@
+endif

-$(ASMOBJS) : %.o : %.s
+$(ASMOBJS) : $(OBJDIR)/%.o : %.s Makefile
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	@echo
 	$(AS) -c $(ASFLAGS) -I . $(IINCDIR) $< -o $@
+else
+	@echo Compiling $<
+	@$(AS) -c $(ASFLAGS) -I . $(IINCDIR) $< -o $@
+endif

-%elf: $(OBJS)
+%.elf: $(OBJS) $(LDSCRIPT)
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	@echo
 	$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
+else
+	@echo Linking $@
+	@$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
+endif

-%hex: %elf
+%.hex: %.elf $(LDSCRIPT)
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	$(HEX) $< $@
+else
+	@echo Creating $@
+	@$(HEX) $< $@
+endif

-%bin: %elf
+%.bin: %.elf $(LDSCRIPT)
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	$(BIN) $< $@
+else
+	@echo Creating $@
+	@$(BIN) $< $@
+endif

-%dmp: %elf
+%.dmp: %.elf $(LDSCRIPT)
+ifeq ($(USE_VERBOSE_COMPILE),yes)
 	$(OD) $(ODFLAGS) $< > $@
+else
+	@echo Creating $@
+	@$(OD) $(ODFLAGS) $< > $@
+	@echo Done
+endif

 clean:
-	-rm -f $(OBJS)
-	-rm -f $(ACSRC:.c=.lst) $(TCSRC:.c=.lst) $(ACPPSRC:.cpp=.lst) $(TCPPSRC:.cpp=.lst) $(ASMSRC:.s=.lst)
-	-rm -f $(OUTFILES) $(BUILDDIR)/$(PROJECT).map
-	-rm -fR .dep $(CLEANDIR)
+	@echo Cleaning
+	-rm -fR .dep $(BUILDDIR)
+	@echo Done

 #
 # Include the dependency files, should be the last of the makefile
--- a/readme.txt
+++ b/readme.txt
@ -77,6 +77,11 @@
 - FIX: Fixed broken TIM8 support in STM32 PWM driver (bug 3418620).
 - FIX: Fixed halconf.h file corrupted in some STM32 demos (bug 3418626).
 - NEW: Added memory copy functionality to the STM32 DMA driver.
+- NEW: Implemented new makefile system for ARM GCC ports, now objects,
+  listings and out files are generated into a "build" directory and not
+  together with sources. Also implemented a simplified output log mode.
+  Now makefiles and load stript files are requirements and trigger a
+  rebuild if touched.

 *** 2.3.3 ***
 - FIX: Fixed uninitialized variable in STM32 PWM and ICU drivers (bug 3413558).
--- a/testhal/LPC11xx/IRQ_STORM/Makefile
+++ b/testhal/LPC11xx/IRQ_STORM/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/LPC13xx/IRQ_STORM/Makefile
+++ b/testhal/LPC13xx/IRQ_STORM/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/ADC/Makefile
+++ b/testhal/STM32F1xx/ADC/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/CAN/Makefile
+++ b/testhal/STM32F1xx/CAN/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/EXT/Makefile
+++ b/testhal/STM32F1xx/EXT/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/EXT_WAKEUP/Makefile
+++ b/testhal/STM32F1xx/EXT_WAKEUP/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/GPT/Makefile
+++ b/testhal/STM32F1xx/GPT/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/I2C/Makefile
+++ b/testhal/STM32F1xx/I2C/Makefile
@ -24,9 +24,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/IRQ_STORM/Makefile
+++ b/testhal/STM32F1xx/IRQ_STORM/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/MAC/Makefile
+++ b/testhal/STM32F1xx/MAC/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/PWM-ICU/Makefile
+++ b/testhal/STM32F1xx/PWM-ICU/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/RTC/Makefile
+++ b/testhal/STM32F1xx/RTC/Makefile
@ -34,9 +34,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/SDC/Makefile
+++ b/testhal/STM32F1xx/SDC/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/SPI/Makefile
+++ b/testhal/STM32F1xx/SPI/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/UART/Makefile
+++ b/testhal/STM32F1xx/UART/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/USB_CDC/Makefile
+++ b/testhal/STM32F1xx/USB_CDC/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32F1xx/USB_MSC/Makefile
+++ b/testhal/STM32F1xx/USB_MSC/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32L1xx/ADC/Makefile
+++ b/testhal/STM32L1xx/ADC/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32L1xx/EXT/Makefile
+++ b/testhal/STM32L1xx/EXT/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32L1xx/GPT/Makefile
+++ b/testhal/STM32L1xx/GPT/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32L1xx/IRQ_STORM/Makefile
+++ b/testhal/STM32L1xx/IRQ_STORM/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32L1xx/PWM-ICU/Makefile
+++ b/testhal/STM32L1xx/PWM-ICU/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32L1xx/SPI/Makefile
+++ b/testhal/STM32L1xx/SPI/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/testhal/STM32L1xx/UART/Makefile
+++ b/testhal/STM32L1xx/UART/Makefile
@ -23,9 +23,9 @@ ifeq ($(USE_THUMB),)
  USE_THUMB = yes
 endif

-# Enable register caching optimization (read documentation).
-ifeq ($(USE_CURRP_CACHING),)
-  USE_CURRP_CACHING = no
+# Enable this if you want to see the full log while compiling.
+ifeq ($(USE_VERBOSE_COMPILE),)
+  USE_VERBOSE_COMPILE = no
 endif

 #
--- a/todo.txt
+++ b/todo.txt
@ -6,6 +6,7 @@ X = In progress, some work done.
 N = Decided against.

 Current Pipeline (2.3.x):
+* Improved Makefile system.
 - USB driver enhancements.
  - USB and USB_SERIAL APIs reclassification.
  - Incorporate the USB bus attach/detach handling in usbStart()/usbStop().
@ -35,7 +36,6 @@ X Implement the "transmission end" serial driver event on those platforms
  with different subsystems and not just the kernel.
 - Reduce number of demos globally, add demos to a repository or on web site.
  Required in order to reduce support effort.
- Improved Makefile system.
 - MAC driver for STM32F107.
 - FatFs wrapper.
 - New device driver models: Clock, Systick, RTC, WDG, DAC, Power Monitor.