aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-03-28 11:56:07 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-03-28 11:56:07 +0000
commitf215593479abba0b08e1b94794fb367d2549bab2 (patch)
tree495852cb6e2b4f45e3dd65c4385ed2226b45a79e /os
parent4cd975affe635e7e635a76eafd2b0f9b4b747e07 (diff)
downloadChibiOS-f215593479abba0b08e1b94794fb367d2549bab2.tar.gz
ChibiOS-f215593479abba0b08e1b94794fb367d2549bab2.tar.bz2
ChibiOS-f215593479abba0b08e1b94794fb367d2549bab2.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7824 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
-rw-r--r--os/nil/ports/ARMCMx/compilers/GCC/mk/port_generic_cm0.mk12
-rw-r--r--os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk15
-rw-r--r--os/nil/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk8
-rw-r--r--os/rt/ports/ARMCMx/compilers/GCC/mk/port_generic_cm0.mk12
-rw-r--r--os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk15
-rw-r--r--os/rt/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk8
6 files changed, 16 insertions, 54 deletions
diff --git a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_generic_cm0.mk b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_generic_cm0.mk
deleted file mode 100644
index 7cdf3f5f1..000000000
--- a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_generic_cm0.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# List of the ChibiOS/NIL Cortex-M0 generic 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
-
-PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s \
- $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v6m.s
-
-PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \
- ${CHIBIOS}/os/nil/ports/ARMCMx \
- ${CHIBIOS}/os/nil/ports/ARMCMx/compilers/GCC
diff --git a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk
deleted file mode 100644
index 2d85ceda4..000000000
--- a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# List of the ChibiOS/NIL Cortex-M0 STM32F0xx port files.
-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 = $(STARTUPASM) \
- $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v6m.s
-
-PORTINC = $(STARTUPINC) \
- $(CHIBIOS)/os/nil/ports/ARMCMx \
- $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC
-
-PORTLD = $(STARTUPLD)
diff --git a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
new file mode 100644
index 000000000..6fa7d52ea
--- /dev/null
+++ b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
@@ -0,0 +1,8 @@
+# List of the ChibiOS/NIL ARMv6M generic port files.
+PORTSRC = $(CHIBIOS)/os/nil/ports/ARMCMx/nilcore.c \
+ $(CHIBIOS)/os/nil/ports/ARMCMx/nilcore_v6m.c
+
+PORTASM = $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v6m.s
+
+PORTINC = $(CHIBIOS)/os/nil/ports/ARMCMx \
+ $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC
diff --git a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_generic_cm0.mk b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_generic_cm0.mk
deleted file mode 100644
index 904af6a08..000000000
--- a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_generic_cm0.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# List of the ChibiOS/RT Cortex-M0 generic 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_v6m.c
-
-PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s \
- $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s
-
-PORTINC = $(CHIBIOS)/os/ext/CMSIS/include \
- $(CHIBIOS)/os/rt/ports/ARMCMx \
- $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC
diff --git a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk
deleted file mode 100644
index bd3e68c02..000000000
--- a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# List of the ChibiOS/RT Cortex-M0 STM32F0xx port files.
-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 = $(STARTUPASM) \
- $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s
-
-PORTINC = $(STARTUPINC) \
- $(CHIBIOS)/os/rt/ports/ARMCMx \
- $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC
-
-PORTLD = $(STARTUPLD)
diff --git a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
new file mode 100644
index 000000000..f9c0fd521
--- /dev/null
+++ b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
@@ -0,0 +1,8 @@
+# List of the ChibiOS/RT Cortex-M0 STM32F0xx port files.
+PORTSRC = $(CHIBIOS)/os/rt/ports/ARMCMx/chcore.c \
+ $(CHIBIOS)/os/rt/ports/ARMCMx/chcore_v6m.c
+
+PORTASM = $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s
+
+PORTINC = $(CHIBIOS)/os/rt/ports/ARMCMx \
+ $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC