From 2eb806050267e45254faf44bb6dfd73a5e0f1fe5 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Thu, 26 Mar 2015 15:48:31 +0000 Subject: Improved mk files for STM32 ports. Removed an unused file. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7814 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk | 13 ++++++------- os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk | 13 ++++++------- os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk | 16 ---------------- os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk | 13 ++++++------- os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk | 13 ++++++------- os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk | 13 ++++++------- 6 files changed, 30 insertions(+), 51 deletions(-) delete mode 100644 os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk (limited to 'os/rt') diff --git a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk index a9b833e73..bd3e68c02 100644 --- a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk +++ b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk @@ -1,16 +1,15 @@ # List of the ChibiOS/RT Cortex-M0 STM32F0xx port files. -PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0.c \ - $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c \ +include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk + +PORTSRC = $(STARTUPSRC) \ $(CHIBIOS)/os/rt/ports/ARMCMx/chcore.c \ $(CHIBIOS)/os/rt/ports/ARMCMx/chcore_v6m.c -PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s \ +PORTASM = $(STARTUPASM) \ $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s -PORTINC = $(CHIBIOS)/os/ext/CMSIS/include \ - $(CHIBIOS)/os/ext/CMSIS/ST \ - $(CHIBIOS)/os/common/ports/ARMCMx/devices/STM32F0xx \ +PORTINC = $(STARTUPINC) \ $(CHIBIOS)/os/rt/ports/ARMCMx \ $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC -PORTLD = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/ld +PORTLD = $(STARTUPLD) diff --git a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk index 19b704ef1..658751735 100644 --- a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk +++ b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk @@ -1,16 +1,15 @@ # List of the ChibiOS/RT Cortex-M3 STM32F1xx port files. -PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0.c \ - $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c \ +include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk + +PORTSRC = $(STARTUPSRC) \ $(CHIBIOS)/os/rt/ports/ARMCMx/chcore.c \ $(CHIBIOS)/os/rt/ports/ARMCMx/chcore_v7m.c -PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s \ +PORTASM = $(STARTUPASM) \ $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s -PORTINC = $(CHIBIOS)/os/ext/CMSIS/include \ - $(CHIBIOS)/os/ext/CMSIS/ST \ - $(CHIBIOS)/os/common/ports/ARMCMx/devices/STM32F1xx \ +PORTINC = $(STARTUPINC) \ $(CHIBIOS)/os/rt/ports/ARMCMx \ $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC -PORTLD = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/ld +PORTLD = $(STARTUPLD) diff --git a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk deleted file mode 100644 index dc770e634..000000000 --- a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk +++ /dev/null @@ -1,16 +0,0 @@ -# List of the ChibiOS/RT 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/rt/ports/ARMCMx/chcore.c \ - $(CHIBIOS)/os/rt/ports/ARMCMx/chcore_v7m.c - -PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s \ - $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s - -PORTINC = $(CHIBIOS)/os/ext/CMSIS/include \ - $(CHIBIOS)/os/ext/CMSIS/ST \ - $(CHIBIOS)/os/common/ports/ARMCMx/devices/STM32F37x \ - $(CHIBIOS)/os/rt/ports/ARMCMx \ - $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC - -PORTLD = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/ld diff --git a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk index 6e75c47fd..4d99261fb 100644 --- a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk +++ b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk @@ -1,16 +1,15 @@ # List of the ChibiOS/RT Cortex-M4 STM32F3xx port files. -PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0.c \ - $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c \ +include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk + +PORTSRC = $(STARTUPSRC) \ $(CHIBIOS)/os/rt/ports/ARMCMx/chcore.c \ $(CHIBIOS)/os/rt/ports/ARMCMx/chcore_v7m.c -PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s \ +PORTASM = $(STARTUPASM) \ $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s -PORTINC = $(CHIBIOS)/os/ext/CMSIS/include \ - $(CHIBIOS)/os/ext/CMSIS/ST \ - $(CHIBIOS)/os/common/ports/ARMCMx/devices/STM32F3xx \ +PORTINC = $(STARTUPINC) \ $(CHIBIOS)/os/rt/ports/ARMCMx \ $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC -PORTLD = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/ld +PORTLD = $(STARTUPLD) diff --git a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk index 6b9e03ac0..43d2f21b7 100644 --- a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk +++ b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk @@ -1,16 +1,15 @@ # List of the ChibiOS/RT Cortex-M4 STM32F4xx port files. -PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0.c \ - $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c \ +include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk + +PORTSRC = $(STARTUPSRC) \ $(CHIBIOS)/os/rt/ports/ARMCMx/chcore.c \ $(CHIBIOS)/os/rt/ports/ARMCMx/chcore_v7m.c -PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s \ +PORTASM = $(STARTUPASM) \ $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s -PORTINC = $(CHIBIOS)/os/ext/CMSIS/include \ - $(CHIBIOS)/os/ext/CMSIS/ST \ - $(CHIBIOS)/os/common/ports/ARMCMx/devices/STM32F4xx \ +PORTINC = $(STARTUPINC) \ $(CHIBIOS)/os/rt/ports/ARMCMx \ $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC -PORTLD = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/ld +PORTLD = $(STARTUPLD) diff --git a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk index c6635eaad..3ae4ffed3 100644 --- a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk +++ b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk @@ -1,16 +1,15 @@ # List of the ChibiOS/RT Cortex-M3 STM32L1xx port files. -PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0.c \ - $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c \ +include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32l1xx.mk + +PORTSRC = $(STARTUPSRC) \ $(CHIBIOS)/os/rt/ports/ARMCMx/chcore.c \ $(CHIBIOS)/os/rt/ports/ARMCMx/chcore_v7m.c -PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s \ +PORTASM = $(STARTUPASM) \ $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s -PORTINC = $(CHIBIOS)/os/ext/CMSIS/include \ - $(CHIBIOS)/os/ext/CMSIS/ST \ - $(CHIBIOS)/os/common/ports/ARMCMx/devices/STM32L1xx \ +PORTINC = $(STARTUPINC) \ $(CHIBIOS)/os/rt/ports/ARMCMx \ $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC -PORTLD = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/ld +PORTLD = $(STARTUPLD) -- cgit v1.2.3