Updated all the testhal/STM32 demos

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11667 110e8d01-0319-4d1e-a829-52ad28d1bb01

8 files changed, 66 insertions, 118 deletions

diff --git a/testhal/STM32/STM32F3xx/ADC/Makefile b/testhal/STM32/STM32F3xx/ADC/Makefile
index 7acae2819..5458afa0c 100644
--- a/testhal/STM32/STM32F3xx/ADC/Makefile
+++ b/testhal/STM32/STM32F3xx/ADC/Makefile
@@ -87,6 +87,9 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../../..

+

+# 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).

@@ -107,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

@@ -142,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)/os/various

+INCDIR = $(ALLINC) $(TESTINC)

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F3xx/ADC_DUAL/Makefile b/testhal/STM32/STM32F3xx/ADC_DUAL/Makefile
index 7acae2819..5458afa0c 100644
--- a/testhal/STM32/STM32F3xx/ADC_DUAL/Makefile
+++ b/testhal/STM32/STM32F3xx/ADC_DUAL/Makefile
@@ -87,6 +87,9 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../../..

+

+# 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).

@@ -107,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

@@ -142,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)/os/various

+INCDIR = $(ALLINC) $(TESTINC)

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F3xx/CAN/Makefile b/testhal/STM32/STM32F3xx/CAN/Makefile
index 7acae2819..5458afa0c 100644
--- a/testhal/STM32/STM32F3xx/CAN/Makefile
+++ b/testhal/STM32/STM32F3xx/CAN/Makefile
@@ -87,6 +87,9 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../../..

+

+# 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).

@@ -107,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

@@ -142,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)/os/various

+INCDIR = $(ALLINC) $(TESTINC)

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F3xx/DAC/Makefile b/testhal/STM32/STM32F3xx/DAC/Makefile
index 7acae2819..5458afa0c 100644
--- a/testhal/STM32/STM32F3xx/DAC/Makefile
+++ b/testhal/STM32/STM32F3xx/DAC/Makefile
@@ -87,6 +87,9 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../../..

+

+# 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).

@@ -107,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

@@ -142,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)/os/various

+INCDIR = $(ALLINC) $(TESTINC)

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F3xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F3xx/IRQ_STORM/Makefile
index 7340ba8b1..315a06959 100644
--- a/testhal/STM32/STM32F3xx/IRQ_STORM/Makefile
+++ b/testhal/STM32/STM32F3xx/IRQ_STORM/Makefile
@@ -87,6 +87,9 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../../..

+

+# 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).

@@ -98,6 +101,7 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk

 # Other files (optional).

+include $(CHIBIOS)/os/hal/lib/streams/streams.mk

 #include $(CHIBIOS)/test/lib/test.mk

 #include $(CHIBIOS)/test/rt/rt_test.mk

 #include $(CHIBIOS)/test/oslib/oslib_test.mk

@@ -107,22 +111,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)/os/hal/lib/streams/memstreams.c \

-       $(CHIBIOS)/os/hal/lib/streams/chprintf.c \

        $(CHIBIOS)/testhal/common/irq_storm.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

@@ -145,14 +141,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) \

-         $(CHIBIOS)/os/hal/lib/streams \

-         $(CHIBIOS)/os/various \

+ASMSRC = $(ALLASMSRC)

+ASMXSRC = $(ALLXASMSRC)

+

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

          $(CHIBIOS)/testhal/common

 

 #

diff --git a/testhal/STM32/STM32F3xx/PWM-ICU/Makefile b/testhal/STM32/STM32F3xx/PWM-ICU/Makefile
index 7acae2819..5458afa0c 100644
--- a/testhal/STM32/STM32F3xx/PWM-ICU/Makefile
+++ b/testhal/STM32/STM32F3xx/PWM-ICU/Makefile
@@ -87,6 +87,9 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../../..

+

+# 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).

@@ -107,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

@@ -142,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)/os/various

+INCDIR = $(ALLINC) $(TESTINC)

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile b/testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile
index a9c33e07c..31fa9a28c 100644
--- a/testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile
+++ b/testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile
@@ -87,6 +87,9 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../../..

+

+# 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).

@@ -109,21 +112,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) \

-       $(STREAMSSRC) \

-       $(SHELLSRC) \

        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

@@ -146,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) \

-         $(STREAMSINC) $(SHELLINC)

+INCDIR = $(ALLINC) $(TESTINC)

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F3xx/WDG/Makefile b/testhal/STM32/STM32F3xx/WDG/Makefile
index 7acae2819..5458afa0c 100644
--- a/testhal/STM32/STM32F3xx/WDG/Makefile
+++ b/testhal/STM32/STM32F3xx/WDG/Makefile
@@ -87,6 +87,9 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../../..

+

+# 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).

@@ -107,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

@@ -142,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)/os/various

+INCDIR = $(ALLINC) $(TESTINC)

 

 #

 # Project, sources and paths