From 0e5d2023d41f951e03c9fbf5fe16402f7b04aac0 Mon Sep 17 00:00:00 2001
From: Theodore Ateba <tf.ateba@gmail.com>
Date: Sat, 6 Nov 2021 17:36:18 +0000
Subject: [PATCH] Align AVR demo Makefiles.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15018 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
---
 demos/AVR/NIL-ARDUINO-MEGA/Makefile         | 45 +++++++++----------
 demos/AVR/NIL-ARDUINO-MINI/Makefile         | 19 ++++----
 demos/AVR/NIL-ARDUINO-NANO/Makefile         | 19 ++++----
 demos/AVR/NIL-ARDUINO-UNO/Makefile          | 19 ++++----
 demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile | 16 +++----
 demos/AVR/NIL-MT-DB-X4/Makefile             | 18 ++++----
 demos/AVR/RT-ARDUINO-LEONARDO/Makefile      | 30 ++++++-------
 demos/AVR/RT-ARDUINO-MEGA/Makefile          | 16 +++----
 demos/AVR/RT-ARDUINO-MINI/Makefile          | 17 ++++----
 demos/AVR/RT-ARDUINO-NANO/Makefile          | 17 ++++----
 demos/AVR/RT-ARDUINO-UNO/Makefile           | 18 ++++----
 demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile  | 16 +++----
 demos/AVR/RT-MT-DB-X4/Makefile              | 16 +++----
 demos/AVR/RT-PRO-MICRO/Makefile             | 16 +++----
 demos/AVR/RT-TEENSY2-USB/Makefile           | 16 +++----
 demos/AVR/TEST-SUITE-NIL/Makefile           | 48 ++++++++++-----------
 demos/AVR/TEST-SUITE-OSLIB/Makefile         | 16 +++----
 demos/AVR/TEST-SUITE-RT/Makefile            | 16 +++----
 18 files changed, 181 insertions(+), 197 deletions(-)

diff --git a/demos/AVR/NIL-ARDUINO-MEGA/Makefile b/demos/AVR/NIL-ARDUINO-MEGA/Makefile
index 0a47b4c68..26bc6b181 100644
--- a/demos/AVR/NIL-ARDUINO-MEGA/Makefile
+++ b/demos/AVR/NIL-ARDUINO-MEGA/Makefile
@@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -123,30 +123,27 @@ INCDIR =  $(CONFDIR) $(ALLINC)
 MCU = atmega2560
 
 # MCU frequency (Hz).
-F_CPU=16000000
+F_CPU = 16000000
 
 # Output format. (can be srec, ihex, binary)
-FORMAT=ihex
+FORMAT = ihex
 
 # C and C++ Compiler name.
-TRGT=avr-
-CC=$(TRGT)gcc
-CPPC=$(TRGT)g++
+TRGT = avr-
+CC   = $(TRGT)gcc
+CPPC = $(TRGT)g++
 
 # Enable loading with g++ only if you need C++ runtime support.
 # NOTE: You can use C++ even without C++ support if you are careful. C++
 #       runtime support makes code size explode.
-LD  = $(TRGT)gcc
-CP  = $(TRGT)objcopy
-AR  = $(TRGT)ar rcs
-OD  = $(TRGT)objdump
-NM  = $(TRGT)nm
-SZ  = $(TRGT)size
-HEX = $(CP) -O ihex
-BIN = $(CP) -O binary
-
-# AVR programming tool.
-AVRDUDE = avrdude
+LD    = $(TRGT)gcc
+CP    = $(TRGT)objcopy
+AR    = $(TRGT)ar rcs
+OD    = $(TRGT)objdump
+NM    = $(TRGT)nm
+SZ    = $(TRGT)size
+HEX   = $(CP) -O ihex
+BIN   = $(CP) -O binary
 
 # Size of the elf binary file.
 ELFSIZE = $(SZ) --mcu=$(MCU) --format=avr $(BUILDDIR)/$(PROJECT).elf
@@ -169,7 +166,7 @@ CPPWARN =
 #
 
 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0
 
 # Define ASM defines here.
 UADEFS =
@@ -230,7 +227,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -243,18 +240,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/NIL-ARDUINO-MINI/Makefile b/demos/AVR/NIL-ARDUINO-MINI/Makefile
index 8bdfa3127..6bf730333 100644
--- a/demos/AVR/NIL-ARDUINO-MINI/Makefile
+++ b/demos/AVR/NIL-ARDUINO-MINI/Makefile
@@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -145,9 +145,6 @@ SZ    = $(TRGT)size
 HEX   = $(CP) -O ihex
 BIN   = $(CP) -O binary
 
-# AVR programming tool.
-AVRDUDE = avrdude
-
 # Size of the elf binary file.
 ELFSIZE = $(SZ) --mcu=$(MCU) --format=avr $(BUILDDIR)/$(PROJECT).elf
 
@@ -169,7 +166,7 @@ CPPWARN =
 #
 
 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0
 
 # Define ASM defines here.
 UADEFS =
@@ -230,7 +227,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -243,18 +240,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/NIL-ARDUINO-NANO/Makefile b/demos/AVR/NIL-ARDUINO-NANO/Makefile
index 2b39575b5..fd4ae52db 100644
--- a/demos/AVR/NIL-ARDUINO-NANO/Makefile
+++ b/demos/AVR/NIL-ARDUINO-NANO/Makefile
@@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -145,9 +145,6 @@ SZ    = $(TRGT)size
 HEX   = $(CP) -O ihex
 BIN   = $(CP) -O binary
 
-# AVR programming tool.
-AVRDUDE = avrdude
-
 # Size of the elf binary file.
 ELFSIZE = $(SZ) --mcu=$(MCU) --format=avr $(BUILDDIR)/$(PROJECT).elf
 
@@ -169,7 +166,7 @@ CPPWARN =
 #
 
 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0
 
 # Define ASM defines here.
 UADEFS =
@@ -230,7 +227,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -243,18 +240,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/NIL-ARDUINO-UNO/Makefile b/demos/AVR/NIL-ARDUINO-UNO/Makefile
index 9958e06f8..2eb63b2e3 100644
--- a/demos/AVR/NIL-ARDUINO-UNO/Makefile
+++ b/demos/AVR/NIL-ARDUINO-UNO/Makefile
@@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -145,9 +145,6 @@ SZ    = $(TRGT)size
 HEX   = $(CP) -O ihex
 BIN   = $(CP) -O binary
 
-# AVR programming tool.
-AVRDUDE = avrdude
-
 # Size of the elf binary file.
 ELFSIZE = $(SZ) --mcu=$(MCU) --format=avr $(BUILDDIR)/$(PROJECT).elf
 
@@ -169,7 +166,7 @@ CPPWARN =
 #
 
 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0
 
 # Define ASM defines here.
 UADEFS =
@@ -230,7 +227,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -243,18 +240,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile b/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile
index 153943b3d..9bac3bf05 100644
--- a/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile
+++ b/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile
@@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -166,7 +166,7 @@ CPPWARN =
 #
 
 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0
 
 # Define ASM defines here.
 UADEFS =
@@ -227,7 +227,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -240,18 +240,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/NIL-MT-DB-X4/Makefile b/demos/AVR/NIL-MT-DB-X4/Makefile
index 544d6b241..758e9a400 100644
--- a/demos/AVR/NIL-MT-DB-X4/Makefile
+++ b/demos/AVR/NIL-MT-DB-X4/Makefile
@@ -82,8 +82,8 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
-CHIBIOS := ../../..
+# Imported source files and paths.
+CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
 DEPDIR   := ./.dep
@@ -166,7 +166,7 @@ CPPWARN =
 #
 
 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0
 
 # Define ASM defines here.
 UADEFS =
@@ -227,7 +227,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -240,18 +240,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/RT-ARDUINO-LEONARDO/Makefile b/demos/AVR/RT-ARDUINO-LEONARDO/Makefile
index 19b801190..02d22d43b 100644
--- a/demos/AVR/RT-ARDUINO-LEONARDO/Makefile
+++ b/demos/AVR/RT-ARDUINO-LEONARDO/Makefile
@@ -56,7 +56,6 @@ ifeq ($(USE_VERBOSE_PROGRAMMATION),)
   USE_VERBOSE_PROGRAMMATION = no
 endif
 
-
 # Enable this if you want to use AVRDUDE programmer.
 ifeq ($(USE_AVRDUDE_PROGRAMMER),)
   USE_AVRDUDE_PROGRAMMER = yes
@@ -71,6 +70,7 @@ endif
 ifeq ($(USE_MICRONUCLEUS_PROGRAMMER),)
   USE_MICRONUCLEUS_PROGRAMMER = no
 endif
+
 #
 # Building and programming global options.
 ##############################################################################
@@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -167,7 +167,7 @@ CPPWARN =
 #
 
 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0
 
 # Define ASM defines here.
 UADEFS =
@@ -197,11 +197,11 @@ MICRONUCLEUS          = micronucleus
 
 # Set the AVR programmer according to the selection..
 ifeq ($(USE_AVRDUDE_PROGRAMMER),yes)
-	AVR_PROGRAMMER      = $(AVRDUDE_PROGRAMMER)
+	AVR_PROGRAMMER = $(AVRDUDE_PROGRAMMER)
 else ifeq ($(USE_DFU_PROGRAMMER),yes)
-	AVR_PROGRAMMER      = $(DFU_PROGRAMMER)
+	AVR_PROGRAMMER = $(DFU_PROGRAMMER)
 else ifeq ($(USE_MICRONUCLEUS_PROGRAMMER),yes)
-	AVR_PROGRAMMER      = $(MICRONUCLEUS_PROGRAMMER)
+	AVR_PROGRAMMER = $(MICRONUCLEUS_PROGRAMMER)
 else
   $(error ERROR: Please you need to configure the AVR programmer!)
 endif
@@ -209,7 +209,7 @@ endif
 # AVR serial port.
 AVRDUDE_PORT = /dev/ttyACM0
 
-AVRDUDE_WRITE_FLASH = -D -Uflash:w:$(BUILDDIR)/$(PROJECT).hex
+AVRDUDE_WRITE_FLASH = -D -U flash:w:$(BUILDDIR)/$(PROJECT).hex
 
 # Check if the counter cycle erase must be performed after device programming.
 ifeq ($(USE_AVRDUDE_ERASE_COUNTER),yes)
@@ -228,13 +228,13 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 57600
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
-AVRDUDE_FLAGS +=$(AVRDUDE_NO_VERIFY)
-AVRDUDE_FLAGS +=$(AVRDUDE_VERBOSE)
-AVRDUDE_FLAGS +=$(AVRDUDE_ERASE_COUNTER)
+AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
+AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)
+AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
 endif
 
 # AVR programmer flags for DFU programmer.
@@ -247,10 +247,10 @@ endif
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG     = --run
-MICRONUCLEUS_TYPE_ARG    = --type raw
+MICRONUCLEUS_RUN_ARG  = --run
+MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS = $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
 MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
 MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
@@ -279,7 +279,7 @@ ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
 program: $(BUILDDIR)/$(PROJECT).hex
 	@echo
 	@echo Programming $(MCU) device.
-	$(AVR_PROGRAMMER) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
+	$(AVR_PROGRAMMER) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $<
 	@echo Done.
 endif
 
diff --git a/demos/AVR/RT-ARDUINO-MEGA/Makefile b/demos/AVR/RT-ARDUINO-MEGA/Makefile
index a56c98447..228afd5e8 100644
--- a/demos/AVR/RT-ARDUINO-MEGA/Makefile
+++ b/demos/AVR/RT-ARDUINO-MEGA/Makefile
@@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -166,7 +166,7 @@ CPPWARN =
 #
 
 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0
 
 # Define ASM defines here.
 UADEFS =
@@ -227,7 +227,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -240,18 +240,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/RT-ARDUINO-MINI/Makefile b/demos/AVR/RT-ARDUINO-MINI/Makefile
index 3ae27047b..ca29abaef 100644
--- a/demos/AVR/RT-ARDUINO-MINI/Makefile
+++ b/demos/AVR/RT-ARDUINO-MINI/Makefile
@@ -56,7 +56,6 @@ ifeq ($(USE_VERBOSE_PROGRAMMATION),)
   USE_VERBOSE_PROGRAMMATION = no
 endif
 
-
 # Enable this if you want to use AVRDUDE programmer.
 ifeq ($(USE_AVRDUDE_PROGRAMMER),)
   USE_AVRDUDE_PROGRAMMER = yes
@@ -83,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -167,7 +166,7 @@ CPPWARN =
 #
 
 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0
 
 # Define ASM defines here.
 UADEFS =
@@ -228,7 +227,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -241,18 +240,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/RT-ARDUINO-NANO/Makefile b/demos/AVR/RT-ARDUINO-NANO/Makefile
index d249716de..5e81ed6d9 100644
--- a/demos/AVR/RT-ARDUINO-NANO/Makefile
+++ b/demos/AVR/RT-ARDUINO-NANO/Makefile
@@ -56,7 +56,6 @@ ifeq ($(USE_VERBOSE_PROGRAMMATION),)
   USE_VERBOSE_PROGRAMMATION = no
 endif
 
-
 # Enable this if you want to use AVRDUDE programmer.
 ifeq ($(USE_AVRDUDE_PROGRAMMER),)
   USE_AVRDUDE_PROGRAMMER = yes
@@ -83,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -167,7 +166,7 @@ CPPWARN =
 #
 
 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0
 
 # Define ASM defines here.
 UADEFS =
@@ -228,7 +227,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -241,18 +240,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/RT-ARDUINO-UNO/Makefile b/demos/AVR/RT-ARDUINO-UNO/Makefile
index ce75ebd2b..79b2a6640 100644
--- a/demos/AVR/RT-ARDUINO-UNO/Makefile
+++ b/demos/AVR/RT-ARDUINO-UNO/Makefile
@@ -35,7 +35,7 @@ ifeq ($(USE_VERBOSE_COMPILE),)
   USE_VERBOSE_COMPILE = no
 endif
 
-# If enabled, this option makes the build process faster by not compiling.
+# If enabled, this option makes the build process faster by not compiling
 # modules not used in the current configuration.
 ifeq ($(USE_SMART_BUILD),)
   USE_SMART_BUILD = yes
@@ -109,7 +109,7 @@ CSRC =  $(ALLCSRC) \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(CONFDIR) $(ALLINC)
+INCDIR = $(CONFDIR) $(ALLINC)
 
 #
 # Project, sources and paths.
@@ -166,7 +166,7 @@ CPPWARN =
 #
 
 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0
 
 # Define ASM defines here.
 UADEFS =
@@ -227,7 +227,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -240,18 +240,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile b/demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile
index 9ff585ff0..bf4123571 100644
--- a/demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile
+++ b/demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile
@@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -166,7 +166,7 @@ CPPWARN =
 #
 
 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0
 
 # Define ASM defines here.
 UADEFS =
@@ -227,7 +227,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -240,18 +240,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/RT-MT-DB-X4/Makefile b/demos/AVR/RT-MT-DB-X4/Makefile
index ca7a0c825..fe7fe8a1d 100644
--- a/demos/AVR/RT-MT-DB-X4/Makefile
+++ b/demos/AVR/RT-MT-DB-X4/Makefile
@@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -166,7 +166,7 @@ CPPWARN =
 #
 
 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0
 
 # Define ASM defines here.
 UADEFS =
@@ -227,7 +227,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -240,18 +240,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/RT-PRO-MICRO/Makefile b/demos/AVR/RT-PRO-MICRO/Makefile
index c3064896e..841a1e9a7 100644
--- a/demos/AVR/RT-PRO-MICRO/Makefile
+++ b/demos/AVR/RT-PRO-MICRO/Makefile
@@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -167,7 +167,7 @@ CPPWARN =
 #
 
 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0
 
 # Define ASM defines here.
 UADEFS =
@@ -228,7 +228,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -241,18 +241,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/RT-TEENSY2-USB/Makefile b/demos/AVR/RT-TEENSY2-USB/Makefile
index 593884c3d..dc1e8ac18 100644
--- a/demos/AVR/RT-TEENSY2-USB/Makefile
+++ b/demos/AVR/RT-TEENSY2-USB/Makefile
@@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -118,7 +118,7 @@ CSRC =  $(ALLCSRC)  \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR = $(CONFDIR) $(ALLINC)  $(TESTINC)
+INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)
 
 #
 # Project, sources and paths.
@@ -236,7 +236,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -249,18 +249,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/TEST-SUITE-NIL/Makefile b/demos/AVR/TEST-SUITE-NIL/Makefile
index bb7529bb2..2abaed5c9 100644
--- a/demos/AVR/TEST-SUITE-NIL/Makefile
+++ b/demos/AVR/TEST-SUITE-NIL/Makefile
@@ -82,11 +82,11 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
-CHIBIOS = ../../..
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -113,6 +113,7 @@ CSRC =  $(ALLCSRC) \
 # List C++ sources file here.
 CPPSRC = $(ALLCPPSRC)
 
+# Header files here.
 INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)
 
 #
@@ -124,33 +125,30 @@ INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)
 #
 
 # Micro-Controller Unit.
-MCU = atmega2560
+MCU  = atmega2560
 
 # MCU frequency (Hz).
-F_CPU=16000000
+F_CPU = 16000000
 
 # Output format. (can be srec, ihex, binary)
-FORMAT=ihex
+FORMAT = ihex
 
 # C and C++ Compiler name.
-TRGT=avr-
-CC=$(TRGT)gcc
-CPPC=$(TRGT)g++
+TRGT = avr-
+CC   = $(TRGT)gcc
+CPPC = $(TRGT)g++
 
 # Enable loading with g++ only if you need C++ runtime support.
 # NOTE: You can use C++ even without C++ support if you are careful. C++
 #       runtime support makes code size explode.
-LD  = $(TRGT)gcc
-CP  = $(TRGT)objcopy
-AR  = $(TRGT)ar rcs
-OD  = $(TRGT)objdump
-NM  = $(TRGT)nm
-SZ  = $(TRGT)size
-HEX = $(CP) -O ihex
-BIN = $(CP) -O binary
-
-# AVR programming tool.
-AVRDUDE = avrdude
+LD    = $(TRGT)gcc
+CP    = $(TRGT)objcopy
+AR    = $(TRGT)ar rcs
+OD    = $(TRGT)objdump
+NM    = $(TRGT)nm
+SZ    = $(TRGT)size
+HEX   = $(CP) -O ihex
+BIN   = $(CP) -O binary
 
 # Size of the elf binary file.
 ELFSIZE = $(SZ) --mcu=$(MCU) --format=avr $(BUILDDIR)/$(PROJECT).elf
@@ -234,7 +232,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -247,18 +245,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/TEST-SUITE-OSLIB/Makefile b/demos/AVR/TEST-SUITE-OSLIB/Makefile
index 6341fc670..32179a221 100644
--- a/demos/AVR/TEST-SUITE-OSLIB/Makefile
+++ b/demos/AVR/TEST-SUITE-OSLIB/Makefile
@@ -82,8 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
-CHIBIOS = ../../..
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -114,6 +113,7 @@ CSRC =  $(ALLCSRC) \
 # List C++ sources file here.
 CPPSRC = $(ALLCPPSRC)
 
+# Header files here.
 INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)
 
 #
@@ -232,7 +232,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -245,18 +245,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #
diff --git a/demos/AVR/TEST-SUITE-RT/Makefile b/demos/AVR/TEST-SUITE-RT/Makefile
index 11e885d18..3ff193aa0 100644
--- a/demos/AVR/TEST-SUITE-RT/Makefile
+++ b/demos/AVR/TEST-SUITE-RT/Makefile
@@ -82,8 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
-CHIBIOS = ../../..
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@@ -114,6 +113,7 @@ CSRC =  $(ALLCSRC) \
 # List C++ sources file here.
 CPPSRC = $(ALLCPPSRC)
 
+# Header files here.
 INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)
 
 #
@@ -232,7 +232,7 @@ endif
 
 # AVR programmer flags for AVRDUDE programmer.
 ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
-AVRDUDE_FLAGS = -p $(MCU)
+AVRDUDE_FLAGS =  -p $(MCU)
 AVRDUDE_FLAGS += -P $(AVRDUDE_PORT)
 AVRDUDE_FLAGS += -b 115200
 AVRDUDE_FLAGS += -c $(AVRDUDE_PROGRAMMER_ID)
@@ -245,18 +245,18 @@ endif
 ifeq ($(AVR_PROGRAMMER),$(DFU_PROGRAMMER))
 DFU_WRITE_FLASH = flash --force
 DFU_ERASE_FLASH = erase
-DFU_RESET=reset
+DFU_RESET       = reset
 endif
 
 # AVR programmer flags for MICRONUCLEUS programmer.
 ifeq ($(AVR_PROGRAMMER),$(MICRONUCLEUS_PROGRAMMER))
 MICRONUCLEUS_TIMEOUT_ARG = --timeout 60
-MICRONUCLEUS_RUN_ARG = --run
+MICRONUCLEUS_RUN_ARG  = --run
 MICRONUCLEUS_TYPE_ARG = --type raw
 MICRONUCLEUS_DUMP_PROGRESS = --dump-progress
-MICRONUCLEUS_FLAGS=$(MICRONUCLEUS_TYPE_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_TIMEOUT_ARG)
-MICRONUCLEUS_FLAGS+=$(MICRONUCLEUS_RUN_ARG)
+MICRONUCLEUS_FLAGS =  $(MICRONUCLEUS_TYPE_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_TIMEOUT_ARG)
+MICRONUCLEUS_FLAGS += $(MICRONUCLEUS_RUN_ARG)
 endif
 
 #