3 files changed, 8 insertions, 27 deletions
diff --git a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_generic_cm4.mk b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_generic_cm4.mk
deleted file mode 100644
index 4449d4c14..000000000
--- a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_generic_cm4.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# List of the ChibiOS/NIL Cortex-M4 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_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/nil/ports/ARMCMx \
-          ${CHIBIOS}/os/nil/ports/ARMCMx/compilers/GCC
diff --git a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
deleted file mode 100644
index 9e484696c..000000000
--- a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# List of the ChibiOS/NIL Cortex-M4 STM32F4xx port files.
-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 = $(STARTUPASM) \
-          $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.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_v7m.mk b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
new file mode 100644
index 000000000..3e9c30125
--- /dev/null
+++ b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
@@ -0,0 +1,8 @@
+# List of the ChibiOS/NIL ARMv7M generic port files.
+PORTSRC = $(CHIBIOS)/os/nil/ports/ARMCMx/nilcore.c \
+          $(CHIBIOS)/os/nil/ports/ARMCMx/nilcore_v7m.c
+          
+PORTASM = $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.s
+
+PORTINC = $(CHIBIOS)/os/nil/ports/ARMCMx \
+          $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC