New style makefiles for demos and tests.

20 files changed, 138 insertions, 265 deletions

diff --git a/demos/STM32/RT-STM32F303-DISCOVERY-PID/Makefile b/demos/STM32/RT-STM32F303-DISCOVERY-PID/Makefile
index 2173b3e..738a956 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY-PID/Makefile
+++ b/demos/STM32/RT-STM32F303-DISCOVERY-PID/Makefile
@@ -88,6 +88,8 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../../../ChibiOS-RT

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 # Startup files.

 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk

 # HAL-OSAL files (optional).

@@ -105,20 +107,14 @@ LDSCRIPT= $(STARTUPLD)/STM32F303xC.ld
 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = $(STARTUPSRC) \

-       $(KERNSRC) \

-       $(PORTSRC) \

-       $(OSALSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

+CSRC = $(ALLCSRC) \

        $(TESTSRC) \

        $(CHIBIOS_CONTRIB)/os/various/pid.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CPPSRC =

+CPPSRC = $(ALLCPPSRC)

 

 # C sources to be compiled in ARM mode regardless of the global setting.

 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

@@ -141,12 +137,10 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC =

-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC = $(ALLASMSRC)

+ASMXSRC = $(ALLXASMSRC)

 

-INCDIR = $(CHIBIOS)/os/license \

-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

+INCDIR = $(ALLINC) $(TESTINC) \

          $(CHIBIOS_CONTRIB)/os/various

 

 #

diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile
index 6cf025a..aa99ec7 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile
+++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile
@@ -88,6 +88,8 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../../../ChibiOS-RT

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 # Startup files.

 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk

 # HAL-OSAL files (optional).

@@ -110,16 +112,8 @@ LDSCRIPT = STM32F429xI_SDRAM.ld
 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = $(STARTUPSRC) \

-       $(KERNSRC) \

-       $(PORTSRC) \

-       $(OSALSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

+CSRC = $(ALLCSRC) \

        $(TESTSRC) \

-       $(STREAMSSRC) \

-       $(SHELLSRC) \

        $(CHIBIOS_CONTRIB)/os/various/devices_lib/lcd/ili9341.c \

        main.c usbcfg.c \

        wolf3d_palette.c \

@@ -127,7 +121,7 @@ CSRC = $(STARTUPSRC) \
 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CPPSRC =

+CPPSRC = $(ALLCPPSRC)

 

 # C sources to be compiled in ARM mode regardless of the global setting.

 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

@@ -150,14 +144,10 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC =

-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

-

-INCDIR = $(CHIBIOS)/os/license \

-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

-         $(STREAMSINC) $(SHELLINC) \

-         $(CHIBIOS)/os/various \

+ASMSRC = $(ALLASMSRC)

+ASMXSRC = $(ALLXASMSRC)

+

+INCDIR = $(ALLINC) $(TESTINC) \

          $(CHIBIOS_CONTRIB)/os/various/devices_lib/lcd \

          res

 

diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile
index 1203a72..ead8513 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile
+++ b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile
@@ -88,6 +88,8 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../../../ChibiOS-RT

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 # Startup files.

 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk

 # HAL-OSAL files (optional).

@@ -110,23 +112,15 @@ LDSCRIPT = $(STARTUPLD)/STM32F429xI.ld
 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = $(STARTUPSRC) \

-       $(KERNSRC) \

-       $(PORTSRC) \

-       $(OSALSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

+CSRC = $(ALLCSRC) \

        $(TESTSRC) \

-       $(STREAMSSRC) \

-       $(SHELLSRC) \

        $(CHIBIOS_CONTRIB)/os/various/tribuf.c \

        usbcfg.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CPPSRC =

+CPPSRC = $(ALLCPPSRC)

 

 # C sources to be compiled in ARM mode regardless of the global setting.

 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

@@ -149,14 +143,10 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC =

-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

-

-INCDIR = $(CHIBIOS)/os/license \

-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

-         $(STREAMSINC) $(SHELLINC) \

-         $(CHIBIOS)/os/various \

+ASMSRC = $(ALLASMSRC)

+ASMXSRC = $(ALLXASMSRC)

+

+INCDIR = $(ALLINC) $(TESTINC) \

          $(CHIBIOS_CONTRIB)/os/various

 

 #

diff --git a/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk b/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk
index 8c28257..0303442 100644
--- a/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk
+++ b/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk
@@ -3,3 +3,7 @@ BOARDSRC = $(CHIBIOS_CONTRIB)/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.
 
 # Required include directories
 BOARDINC = $(CHIBIOS_CONTRIB)/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2
+
+# Shared variables
+ALLCSRC += $(BOARDSRC)
+ALLINC  += $(BOARDINC)
diff --git a/os/hal/boards/ST_STM32F0308_DISCOVERY/board.mk b/os/hal/boards/ST_STM32F0308_DISCOVERY/board.mk
index 35b3939..614835d 100644
--- a/os/hal/boards/ST_STM32F0308_DISCOVERY/board.mk
+++ b/os/hal/boards/ST_STM32F0308_DISCOVERY/board.mk
@@ -3,3 +3,7 @@ BOARDSRC = ${CHIBIOS_CONTRIB}/os/hal/boards/ST_STM32F0308_DISCOVERY/board.c
 

 # Required include directories

 BOARDINC = ${CHIBIOS_CONTRIB}/os/hal/boards/ST_STM32F0308_DISCOVERY

+

+# Shared variables

+ALLCSRC += $(BOARDSRC)

+ALLINC  += $(BOARDINC)

diff --git a/testhal/STM32/STM32F0xx/crc/Makefile b/testhal/STM32/STM32F0xx/crc/Makefile
index 7dfc020..6721d80 100644
--- a/testhal/STM32/STM32F0xx/crc/Makefile
+++ b/testhal/STM32/STM32F0xx/crc/Makefile
@@ -83,6 +83,8 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk
 # HAL-OSAL files (optional).
@@ -103,19 +105,13 @@ LDSCRIPT= $(STARTUPLD)/STM32F051x8.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
+CSRC = $(ALLCSRC) \
        $(TESTSRC) \
        main.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
 # C sources to be compiled in ARM mode regardless of the global setting.
 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@@ -138,12 +134,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
+INCDIR = $(ALLINC) $(TESTINC) \
          $(CHIBIOS_CONTRIB)/os/various
 
 #
diff --git a/testhal/STM32/STM32F0xx/onewire/Makefile b/testhal/STM32/STM32F0xx/onewire/Makefile
index cb248f6..c863257 100644
--- a/testhal/STM32/STM32F0xx/onewire/Makefile
+++ b/testhal/STM32/STM32F0xx/onewire/Makefile
@@ -84,6 +84,8 @@ PROJECT = ch
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 TESTHAL = $(CHIBIOS_CONTRIB)/testhal/common/onewire
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk
 # HAL-OSAL files (optional).
@@ -104,20 +106,14 @@ LDSCRIPT= $(STARTUPLD)/STM32F051x8.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
+CSRC = $(ALLCSRC) \
        $(TESTSRC) \
        main.c \
        $(TESTHAL)/testhal_onewire.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
 # C sources to be compiled in ARM mode regardless of the global setting.
 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@@ -140,13 +136,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-         $(CHIBIOS_CONTRIB)/os/various \
+INCDIR = $(ALLINC) $(TESTINC) \
          $(TESTHAL)
 
 #
diff --git a/testhal/STM32/STM32F0xx/qei/Makefile b/testhal/STM32/STM32F0xx/qei/Makefile
index 7dfc020..0e8d92f 100644
--- a/testhal/STM32/STM32F0xx/qei/Makefile
+++ b/testhal/STM32/STM32F0xx/qei/Makefile
@@ -83,6 +83,8 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk
 # HAL-OSAL files (optional).
@@ -103,19 +105,13 @@ LDSCRIPT= $(STARTUPLD)/STM32F051x8.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
+CSRC = $(ALLCSRC) \
        $(TESTSRC) \
        main.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
 # C sources to be compiled in ARM mode regardless of the global setting.
 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@@ -138,13 +134,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-         $(CHIBIOS_CONTRIB)/os/various
+INCDIR = $(ALLINC) $(TESTINC)
 
 #
 # Project, sources and paths
diff --git a/testhal/STM32/STM32F1xx/onewire/Makefile b/testhal/STM32/STM32F1xx/onewire/Makefile
index 5b72418..91052f8 100644
--- a/testhal/STM32/STM32F1xx/onewire/Makefile
+++ b/testhal/STM32/STM32F1xx/onewire/Makefile
@@ -89,6 +89,8 @@ PROJECT = ch
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 TESTHAL = $(CHIBIOS_CONTRIB)/testhal/common/onewire
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
 # HAL-OSAL files (optional).
@@ -109,20 +111,14 @@ LDSCRIPT= $(STARTUPLD)/STM32F103xB.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
+CSRC = $(ALLCSRC) \
        $(TESTSRC) \
        main.c \
        $(TESTHAL)/testhal_onewire.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
 # C sources to be compiled in ARM mode regardless of the global setting.
 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@@ -145,13 +141,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-         $(CHIBIOS_CONTRIB)/os/various \
+INCDIR = $(ALLINC) $(TESTINC) \
          $(TESTHAL)
 
 #
diff --git a/testhal/STM32/STM32F1xx/qei/Makefile b/testhal/STM32/STM32F1xx/qei/Makefile
index f7a7450..5f16036 100644
--- a/testhal/STM32/STM32F1xx/qei/Makefile
+++ b/testhal/STM32/STM32F1xx/qei/Makefile
@@ -88,6 +88,8 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
 # HAL-OSAL files (optional).
@@ -108,19 +110,13 @@ LDSCRIPT= $(STARTUPLD)/STM32F103xB.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
+CSRC = $(ALLCSRC) \
        $(TESTSRC) \
        main.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
 # C sources to be compiled in ARM mode regardless of the global setting.
 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@@ -143,13 +139,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-         $(CHIBIOS_CONTRIB)/os/various
+INCDIR = $(ALLINC) $(TESTINC)
 
 #
 # Project, sources and paths
diff --git a/testhal/STM32/STM32F3xx/COMP/Makefile b/testhal/STM32/STM32F3xx/COMP/Makefile
index 0e3d04d..3730513 100644
--- a/testhal/STM32/STM32F3xx/COMP/Makefile
+++ b/testhal/STM32/STM32F3xx/COMP/Makefile
@@ -88,6 +88,8 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../../../../ChibiOS-RT

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 # Startup files.

 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk

 # HAL-OSAL files (optional).

@@ -108,19 +110,13 @@ LDSCRIPT= $(STARTUPLD)/STM32F303xC.ld
 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = $(STARTUPSRC) \

-       $(KERNSRC) \

-       $(PORTSRC) \

-       $(OSALSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

+CSRC = $(ALLCSRC) \

        $(TESTSRC) \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CPPSRC =

+CPPSRC = $(ALLCPPSRC)

 

 # C sources to be compiled in ARM mode regardless of the global setting.

 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

@@ -143,13 +139,10 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC =

-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC = $(ALLASMSRC)

+ASMXSRC = $(ALLXASMSRC)

 

-INCDIR = $(CHIBIOS)/os/license \

-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

-         $(CHIBIOS_CONTRIB)/os/various

+INCDIR = $(ALLINC) $(TESTINC)

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F3xx/EEProm/Makefile b/testhal/STM32/STM32F3xx/EEProm/Makefile
index 0e3d04d..3730513 100644
--- a/testhal/STM32/STM32F3xx/EEProm/Makefile
+++ b/testhal/STM32/STM32F3xx/EEProm/Makefile
@@ -88,6 +88,8 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../../../../ChibiOS-RT

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 # Startup files.

 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk

 # HAL-OSAL files (optional).

@@ -108,19 +110,13 @@ LDSCRIPT= $(STARTUPLD)/STM32F303xC.ld
 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = $(STARTUPSRC) \

-       $(KERNSRC) \

-       $(PORTSRC) \

-       $(OSALSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

+CSRC = $(ALLCSRC) \

        $(TESTSRC) \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CPPSRC =

+CPPSRC = $(ALLCPPSRC)

 

 # C sources to be compiled in ARM mode regardless of the global setting.

 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

@@ -143,13 +139,10 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC =

-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC = $(ALLASMSRC)

+ASMXSRC = $(ALLXASMSRC)

 

-INCDIR = $(CHIBIOS)/os/license \

-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

-         $(CHIBIOS_CONTRIB)/os/various

+INCDIR = $(ALLINC) $(TESTINC)

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F3xx/TIMCAP/Makefile b/testhal/STM32/STM32F3xx/TIMCAP/Makefile
index b67e7f1..8c6490e 100644
--- a/testhal/STM32/STM32F3xx/TIMCAP/Makefile
+++ b/testhal/STM32/STM32F3xx/TIMCAP/Makefile
@@ -88,6 +88,8 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk
 # HAL-OSAL files (optional).
@@ -108,19 +110,13 @@ LDSCRIPT= $(STARTUPLD)/STM32F303xC.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
+CSRC = $(ALLCSRC) \
        $(TESTSRC) \
        main.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
 # C sources to be compiled in ARM mode regardless of the global setting.
 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@@ -143,13 +139,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-         $(CHIBIOS_CONTRIB)/os/various
+INCDIR = $(ALLINC) $(TESTINC)
 
 #
 # Project, sources and paths
diff --git a/testhal/STM32/STM32F4xx/EICU/Makefile b/testhal/STM32/STM32F4xx/EICU/Makefile
index c1eae62..d458565 100644
--- a/testhal/STM32/STM32F4xx/EICU/Makefile
+++ b/testhal/STM32/STM32F4xx/EICU/Makefile
@@ -88,6 +88,8 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
 # HAL-OSAL files (optional).
@@ -108,19 +110,13 @@ LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
+CSRC = $(ALLCSRC) \
        $(TESTSRC) \
        main.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
 # C sources to be compiled in ARM mode regardless of the global setting.
 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@@ -143,13 +139,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-         $(CHIBIOS_CONTRIB)/os/various
+INCDIR = $(ALLINC) $(TESTINC)
 
 #
 # Project, sources and paths
diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile b/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile
index 5996f17..2c622eb 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile
@@ -88,6 +88,8 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
 # HAL-OSAL files (optional).
@@ -108,13 +110,7 @@ LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
+CSRC = $(ALLCSRC) \
        $(TESTSRC) \
        $(CHIBIOS_CONTRIB)/os/various/bitmap.c \
        dma_storm_adc.c \
@@ -124,7 +120,7 @@ CSRC = $(STARTUPSRC) \
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
 # C sources to be compiled in ARM mode regardless of the global setting.
 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@@ -147,12 +143,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
+INCDIR = $(ALLINC) $(TESTINC) \
          $(CHIBIOS_CONTRIB)/os/various
 
 #
diff --git a/testhal/STM32/STM32F4xx/FSMC_SDRAM/Makefile b/testhal/STM32/STM32F4xx/FSMC_SDRAM/Makefile
index efdd3e9..b575f08 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SDRAM/Makefile
+++ b/testhal/STM32/STM32F4xx/FSMC_SDRAM/Makefile
@@ -88,6 +88,8 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
 # HAL-OSAL files (optional).
@@ -109,13 +111,7 @@ LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
+CSRC = $(ALLCSRC) \
        $(TESTSRC) \
        main.c \
        membench.c \
@@ -123,7 +119,7 @@ CSRC = $(STARTUPSRC) \
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC = $(CHCPPSRC) \
+CPPSRC = $(ALLCPPSRC) \
          $(CHIBIOS_CONTRIB)/os/various/memtest.cpp
 
 # C sources to be compiled in ARM mode regardless of the global setting.
@@ -147,13 +143,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-         $(CHIBIOS)/os/various/cpp_wrappers \
+INCDIR = $(ALLINC) $(TESTINC) \
          $(CHIBIOS_CONTRIB)/os/various
 
 #
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile b/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile
index 28e3d68..a60eef9 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile
@@ -88,6 +88,8 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
 # HAL-OSAL files (optional).
@@ -109,13 +111,7 @@ LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
+CSRC = $(ALLCSRC) \
        $(TESTSRC) \
        main.c \
        membench.c \
@@ -123,7 +119,7 @@ CSRC = $(STARTUPSRC) \
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC = $(CHCPPSRC) \
+CPPSRC = $(ALLCPPSRC) \
          $(CHIBIOS_CONTRIB)/os/various/memtest.cpp
 
 # C sources to be compiled in ARM mode regardless of the global setting.
@@ -147,13 +143,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-         $(CHIBIOS)/os/various/cpp_wrappers \
+INCDIR = $(ALLINC) $(TESTINC) \
          $(CHIBIOS_CONTRIB)/os/various
 
 #
diff --git a/testhal/STM32/STM32F4xx/USB_HOST/Makefile b/testhal/STM32/STM32F4xx/USB_HOST/Makefile
index a29150e..bf0d11a 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/Makefile
+++ b/testhal/STM32/STM32F4xx/USB_HOST/Makefile
@@ -88,6 +88,8 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../../../../ChibiOS-RT

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 # Startup files.

 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk

 # HAL-OSAL files (optional).

@@ -111,22 +113,13 @@ LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CSRC = $(STARTUPSRC) \

-       $(KERNSRC) \

-       $(PORTSRC) \

-       $(OSALSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(TESTSRC)  \

-       $(FATFSSRC) \

-       $(STREAMSSRC) \

-       $(SHELLSRC) \

+CSRC = $(ALLCSRC) \

+       $(TESTSRC) \

        main.c usbh_custom_class_example.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CPPSRC =

+CPPSRC = $(ALLCPPSRC)

 

 # C sources to be compiled in ARM mode regardless of the global setting.

 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

@@ -149,14 +142,10 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC =

-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

-

-INCDIR = $(CHIBIOS)/os/license \

-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

-         $(STREAMSINC) $(SHELLINC) $(FATFSINC) \

-         $(CHIBIOS_CONTRIB)/os/various

+ASMSRC = $(ALLASMSRC)

+ASMXSRC = $(ALLXASMSRC)

+

+INCDIR = $(ALLINC) $(TESTINC)

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F4xx/onewire/Makefile b/testhal/STM32/STM32F4xx/onewire/Makefile
index 17b1f31..0e13de2 100644
--- a/testhal/STM32/STM32F4xx/onewire/Makefile
+++ b/testhal/STM32/STM32F4xx/onewire/Makefile
@@ -89,6 +89,8 @@ PROJECT = ch
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 TESTHAL = $(CHIBIOS_CONTRIB)/testhal/common/onewire
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
 # HAL-OSAL files (optional).
@@ -109,20 +111,14 @@ LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
+CSRC = $(ALLCSRC) \
        $(TESTSRC) \
        main.c \
        $(TESTHAL)/testhal_onewire.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
 # C sources to be compiled in ARM mode regardless of the global setting.
 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@@ -145,13 +141,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-         $(CHIBIOS_CONTRIB)/os/various \
+INCDIR = $(ALLINC) $(TESTINC) \
          $(TESTHAL)
 
 #
diff --git a/testhal/STM32/STM32F7xx/USB_MSD/Makefile b/testhal/STM32/STM32F7xx/USB_MSD/Makefile
index 10ec19f..30d9bec 100644
--- a/testhal/STM32/STM32F7xx/USB_MSD/Makefile
+++ b/testhal/STM32/STM32F7xx/USB_MSD/Makefile
@@ -93,6 +93,8 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f7xx.mk
 # HAL-OSAL files (optional).
@@ -115,16 +117,8 @@ LDSCRIPT= $(STARTUPLD)/STM32F76xxI.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
+CSRC = $(ALLCSRC) \
        $(TESTSRC) \
-       $(STREAMSSRC) \
-       $(SHELLSRC) \
        $(CHIBIOS_CONTRIB)/os/various/ramdisk.c \
        $(CHIBIOS_CONTRIB)/os/various/lib_scsi.c \
        usbcfg.c \
@@ -132,7 +126,7 @@ CSRC = $(STARTUPSRC) \
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
 # C sources to be compiled in ARM mode regardless of the global setting.
 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@@ -155,13 +149,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-         $(STREAMSINC) $(SHELLINC) \
+INCDIR = $(ALLINC) $(TESTINC) \
          $(CHIBIOS_CONTRIB)/os/various
 
 #