From 6cc7199329fa18b0f2a2110c686b71c2d5ea556e Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Thu, 26 Mar 2015 16:04:37 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7815 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- .../NIL-STM32F373-STM32373C_EVAL/Makefile | 2 +- .../ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk | 21 +++++++++---------- .../ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk | 21 +++++++++---------- .../ARMCMx/compilers/GCC/mk/port_stm32f37x.mk | 16 -------------- .../ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk | 21 +++++++++---------- .../ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk | 21 +++++++++---------- .../ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk | 21 +++++++++---------- 7 files changed, 51 insertions(+), 72 deletions(-) delete mode 100644 os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk diff --git a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/Makefile b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/Makefile index 51562554a..f350c3bfe 100644 --- a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/Makefile +++ b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/Makefile @@ -86,7 +86,7 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk include $(CHIBIOS)/os/hal/osal/nil/osal.mk include $(CHIBIOS)/os/nil/nil.mk -include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk +include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk #include $(CHIBIOS)/test/rt/test.mk # Define linker script file here diff --git a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk index c32001f78..2d85ceda4 100644 --- a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk +++ b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk @@ -1,16 +1,15 @@ # List of the ChibiOS/NIL Cortex-M0 STM32F0xx port files. -PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0.c \ - $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c \ - ${CHIBIOS}/os/nil/ports/ARMCMx/nilcore.c \ - ${CHIBIOS}/os/nil/ports/ARMCMx/nilcore_v6m.c +include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk + +PORTSRC = $(STARTUPSRC) \ + $(CHIBIOS)/os/nil/ports/ARMCMx/nilcore.c \ + $(CHIBIOS)/os/nil/ports/ARMCMx/nilcore_v6m.c -PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s \ +PORTASM = $(STARTUPASM) \ $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v6m.s -PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \ - ${CHIBIOS}/os/ext/CMSIS/ST \ - ${CHIBIOS}/os/common/ports/ARMCMx/devices/STM32F0xx \ - ${CHIBIOS}/os/nil/ports/ARMCMx \ - ${CHIBIOS}/os/nil/ports/ARMCMx/compilers/GCC +PORTINC = $(STARTUPINC) \ + $(CHIBIOS)/os/nil/ports/ARMCMx \ + $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC -PORTLD = ${CHIBIOS}/os/common/ports/ARMCMx/compilers/GCC/ld +PORTLD = $(STARTUPLD) diff --git a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk index c6e7f97b9..ebed825ef 100644 --- a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk +++ b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk @@ -1,16 +1,15 @@ # List of the ChibiOS/NIL Cortex-M3 STM32F1xx port files. -PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0.c \ - $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c \ - ${CHIBIOS}/os/nil/ports/ARMCMx/nilcore.c \ - ${CHIBIOS}/os/nil/ports/ARMCMx/nilcore_v7m.c +include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk + +PORTSRC = $(STARTUPSRC) \ + $(CHIBIOS)/os/nil/ports/ARMCMx/nilcore.c \ + $(CHIBIOS)/os/nil/ports/ARMCMx/nilcore_v7m.c -PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s \ +PORTASM = $(STARTUPASM) \ $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.s -PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \ - ${CHIBIOS}/os/ext/CMSIS/ST \ - ${CHIBIOS}/os/common/ports/ARMCMx/devices/STM32F1xx \ - ${CHIBIOS}/os/nil/ports/ARMCMx \ - ${CHIBIOS}/os/nil/ports/ARMCMx/compilers/GCC +PORTINC = $(STARTUPINC) \ + $(CHIBIOS)/os/nil/ports/ARMCMx \ + $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC -PORTLD = ${CHIBIOS}/os/common/ports/ARMCMx/compilers/GCC/ld +PORTLD = $(STARTUPLD) diff --git a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk deleted file mode 100644 index efef95e7b..000000000 --- a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk +++ /dev/null @@ -1,16 +0,0 @@ -# List of the ChibiOS/NIL Cortex-M4 STM32F37x port files. -PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0.c \ - $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c \ - ${CHIBIOS}/os/nil/ports/ARMCMx/nilcore.c \ - ${CHIBIOS}/os/nil/ports/ARMCMx/nilcore_v7m.c - -PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s \ - $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.s - -PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \ - ${CHIBIOS}/os/ext/CMSIS/ST \ - ${CHIBIOS}/os/common/ports/ARMCMx/devices/STM32F3xx \ - ${CHIBIOS}/os/nil/ports/ARMCMx \ - ${CHIBIOS}/os/nil/ports/ARMCMx/compilers/GCC - -PORTLD = ${CHIBIOS}/os/common/ports/ARMCMx/compilers/GCC/ld diff --git a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk index 339b0e5bf..0076771c3 100644 --- a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk +++ b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk @@ -1,16 +1,15 @@ # List of the ChibiOS/NIL Cortex-M4 STM32F3xx port files. -PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0.c \ - $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c \ - ${CHIBIOS}/os/nil/ports/ARMCMx/nilcore.c \ - ${CHIBIOS}/os/nil/ports/ARMCMx/nilcore_v7m.c +include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk + +PORTSRC = $(STARTUPSRC) \ + $(CHIBIOS)/os/nil/ports/ARMCMx/nilcore.c \ + $(CHIBIOS)/os/nil/ports/ARMCMx/nilcore_v7m.c -PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s \ +PORTASM = $(STARTUPASM) \ $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.s -PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \ - ${CHIBIOS}/os/ext/CMSIS/ST \ - ${CHIBIOS}/os/common/ports/ARMCMx/devices/STM32F3xx \ - ${CHIBIOS}/os/nil/ports/ARMCMx \ - ${CHIBIOS}/os/nil/ports/ARMCMx/compilers/GCC +PORTINC = $(STARTUPINC) \ + $(CHIBIOS)/os/nil/ports/ARMCMx \ + $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC -PORTLD = ${CHIBIOS}/os/common/ports/ARMCMx/compilers/GCC/ld +PORTLD = $(STARTUPLD) diff --git a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk index 08da6ab52..9e484696c 100644 --- a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk +++ b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk @@ -1,16 +1,15 @@ # List of the ChibiOS/NIL Cortex-M4 STM32F4xx port files. -PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0.c \ - $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c \ - ${CHIBIOS}/os/nil/ports/ARMCMx/nilcore.c \ - ${CHIBIOS}/os/nil/ports/ARMCMx/nilcore_v7m.c +include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk + +PORTSRC = $(STARTUPSRC) \ + $(CHIBIOS)/os/nil/ports/ARMCMx/nilcore.c \ + $(CHIBIOS)/os/nil/ports/ARMCMx/nilcore_v7m.c -PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s \ +PORTASM = $(STARTUPASM) \ $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.s -PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \ - ${CHIBIOS}/os/ext/CMSIS/ST \ - ${CHIBIOS}/os/common/ports/ARMCMx/devices/STM32F4xx \ - ${CHIBIOS}/os/nil/ports/ARMCMx \ - ${CHIBIOS}/os/nil/ports/ARMCMx/compilers/GCC +PORTINC = $(STARTUPINC) \ + $(CHIBIOS)/os/nil/ports/ARMCMx \ + $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC -PORTLD = ${CHIBIOS}/os/common/ports/ARMCMx/compilers/GCC/ld +PORTLD = $(STARTUPLD) diff --git a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk index 5afafe7db..4727b97b8 100644 --- a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk +++ b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk @@ -1,16 +1,15 @@ # List of the ChibiOS/NIL Cortex-M4 STM32L1xx port files. -PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0.c \ - $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c \ - ${CHIBIOS}/os/nil/ports/ARMCMx/nilcore.c \ - ${CHIBIOS}/os/nil/ports/ARMCMx/nilcore_v7m.c +include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32l1xx.mk + +PORTSRC = $(STARTUPSRC) \ + $(CHIBIOS)/os/nil/ports/ARMCMx/nilcore.c \ + $(CHIBIOS)/os/nil/ports/ARMCMx/nilcore_v7m.c -PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s \ +PORTASM = $(STARTUPASM) \ $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.s -PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \ - ${CHIBIOS}/os/ext/CMSIS/ST \ - ${CHIBIOS}/os/common/ports/ARMCMx/devices/STM32L1xx \ - ${CHIBIOS}/os/nil/ports/ARMCMx \ - ${CHIBIOS}/os/nil/ports/ARMCMx/compilers/GCC +PORTINC = $(STARTUPINC) \ + $(CHIBIOS)/os/nil/ports/ARMCMx \ + $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC -PORTLD = ${CHIBIOS}/os/common/ports/ARMCMx/compilers/GCC/ld +PORTLD = $(STARTUPLD)