aboutsummaryrefslogtreecommitdiffstats
path: root/os/nil/ports
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-03-26 16:04:37 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-03-26 16:04:37 +0000
commit6cc7199329fa18b0f2a2110c686b71c2d5ea556e (patch)
treea7b7f80661d373e3c629f0b3e908843c36c1ae64 /os/nil/ports
parent2eb806050267e45254faf44bb6dfd73a5e0f1fe5 (diff)
downloadChibiOS-6cc7199329fa18b0f2a2110c686b71c2d5ea556e.tar.gz
ChibiOS-6cc7199329fa18b0f2a2110c686b71c2d5ea556e.tar.bz2
ChibiOS-6cc7199329fa18b0f2a2110c686b71c2d5ea556e.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7815 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/nil/ports')
-rw-r--r--os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk21
-rw-r--r--os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk21
-rw-r--r--os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk16
-rw-r--r--os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk21
-rw-r--r--os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk21
-rw-r--r--os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk21
6 files changed, 50 insertions, 71 deletions
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)