STM32. Updated makefiles.

5 files changed, 73 insertions, 44 deletions

diff --git a/testhal/STM32/STM32F0xx/onewire/Makefile b/testhal/STM32/STM32F0xx/onewire/Makefile
index 987a086..72acaf4 100644
--- a/testhal/STM32/STM32F0xx/onewire/Makefile
+++ b/testhal/STM32/STM32F0xx/onewire/Makefile
@@ -76,26 +76,32 @@ PROJECT = ch
 

 # Imported source files and paths

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

+# Startup files.

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

+# HAL-OSAL files (optional).

 include $(CHIBIOS)/community/os/hal/hal.mk

 include $(CHIBIOS)/community/os/hal/boards/ST_STM32F0308_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk

 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+# RTOS files (optional).

 include $(CHIBIOS)/os/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk

+# Other files (optional).

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

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F030x8.ld

+LDSCRIPT= $(STARTUPLD)/STM32F030x8.ld

 

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

 # setting.

-CSRC = $(PORTSRC) \

+CSRC = $(STARTUPSRC) \

        $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

+       $(PORTSRC) \

        $(OSALSRC) \

+       $(HALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

+       $(TESTSRC) \

        main.c \

        onewire_test.c

        

@@ -124,10 +130,10 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = $(PORTASM)

+ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

 

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

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

+INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

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

          $(CHIBIOS)/os/various

 

 #

diff --git a/testhal/STM32/STM32F1xx/onewire/Makefile b/testhal/STM32/STM32F1xx/onewire/Makefile
index b079c47..8875fd8 100644
--- a/testhal/STM32/STM32F1xx/onewire/Makefile
+++ b/testhal/STM32/STM32F1xx/onewire/Makefile
@@ -81,25 +81,32 @@ PROJECT = ch
 

 # Imported source files and paths

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

+# Startup files.

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

+# HAL-OSAL files (optional).

 include $(CHIBIOS)/community/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_103STK/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk

+include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_103STK/board.mk

 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+# RTOS files (optional).

 include $(CHIBIOS)/os/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk

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

+# Other files (optional).

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

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

+LDSCRIPT= $(STARTUPLD)/STM32F103xB.ld

 

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

 # setting.

-CSRC = $(PORTSRC) \

+CSRC = $(STARTUPSRC) \

        $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

+       $(PORTSRC) \

        $(OSALSRC) \

+       $(HALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

+       $(TESTSRC) \

        main.c \

        onewire_test.c

        

@@ -128,10 +135,10 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = $(PORTASM)

+ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

 

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

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

+INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

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

          $(CHIBIOS)/os/various

 

 #

diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile b/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile
index 2651d86..5474ee7 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile
@@ -81,26 +81,30 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS = ../../../../..
+# Startup files.
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
+# HAL-OSAL files (optional).
 include $(CHIBIOS)/community/os/hal/hal.mk
-include $(CHIBIOS)/community/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk
 include $(CHIBIOS)/community/os/hal/ports/STM32/STM32F4xx/platform.mk
+include $(CHIBIOS)/community/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
+# RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
-include $(CHIBIOS)/test/rt/test.mk
-
+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 
 # Define linker script file here
-LDSCRIPT= $(PORTLD)/STM32F407xG.ld
+LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(PORTSRC) \
+CSRC = $(STARTUPSRC) \
        $(KERNSRC) \
-       $(TESTSRC) \
+       $(PORTSRC) \
+       $(OSALSRC) \
        $(HALSRC) \
        $(PLATFORMSRC) \
        $(BOARDSRC) \
+       $(TESTSRC) \
        dma_storm_adc.c \
        dma_storm_spi.c \
        dma_storm_uart.c \
@@ -131,10 +135,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC = $(PORTASM)
+ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
-         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
+INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
+         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
          $(CHIBIOS)/os/various
 
 
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile b/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile
index 33fc717..ec5d18c 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile
@@ -81,25 +81,32 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS = ../../../../..
+# Startup files.
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
+# HAL-OSAL files (optional).
 include $(CHIBIOS)/community/os/hal/hal.mk
-include $(CHIBIOS)/community/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk
 include $(CHIBIOS)/community/os/hal/ports/STM32/STM32F4xx/platform.mk
+include $(CHIBIOS)/community/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
+# RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+# Other files (optional).
 include $(CHIBIOS)/os/various/cpp_wrappers/chcpp.mk
 
 # Define linker script file here
-LDSCRIPT= $(PORTLD)/STM32F407xG.ld
+LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(PORTSRC) \
+CSRC = $(STARTUPSRC) \
        $(KERNSRC) \
-       $(HALSRC) \
+       $(PORTSRC) \
        $(OSALSRC) \
+       $(HALSRC) \
        $(PLATFORMSRC) \
        $(BOARDSRC) \
+       $(TESTSRC) \
        main.c \
        membench.c \
        memcpy_dma.c
@@ -130,10 +137,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC = $(PORTASM)
+ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
-         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
+INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
+         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
          $(CHIBIOS)/os/various/cpp_wrappers \
          $(CHIBIOS)/os/various
 
diff --git a/testhal/STM32/STM32F4xx/onewire/Makefile b/testhal/STM32/STM32F4xx/onewire/Makefile
index ec5cd09..999fb12 100644
--- a/testhal/STM32/STM32F4xx/onewire/Makefile
+++ b/testhal/STM32/STM32F4xx/onewire/Makefile
@@ -81,25 +81,30 @@ PROJECT = ch
 

 # Imported source files and paths

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

+# Startup files.

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

+# HAL-OSAL files (optional).

 include $(CHIBIOS)/community/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

 include $(CHIBIOS)/community/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+# RTOS files (optional).

 include $(CHIBIOS)/os/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

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

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F407xG.ld

+LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld

 

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

 # setting.

-CSRC = $(PORTSRC) \

+CSRC = $(STARTUPSRC) \

        $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

+       $(PORTSRC) \

        $(OSALSRC) \

+       $(HALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

+       $(TESTSRC) \

        main.c \

        onewire_test.c

        

@@ -128,10 +133,10 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = $(PORTASM)

+ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

 

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

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

+INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

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

          $(CHIBIOS)/os/various

 

 #