Improvements to the ARMCMx directories structure organization. Adjusted the affected makefiles (STM32 demos only).

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2330 35acf78f-673a-0410-8e92-d51de3d6d3f4

10 files changed, 18 insertions, 17 deletions

diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile b/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
index 7cdfe1e96..56fc2d719 100644
--- a/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
+++ b/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
@@ -60,7 +60,7 @@ CHIBIOS = ../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

 include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/port.mk

+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk

 include $(CHIBIOS)/os/kernel/kernel.mk

 include $(CHIBIOS)/test/test.mk

 include $(CHIBIOS)/ext/fatfs/fatfs.mk

@@ -104,7 +104,7 @@ TCPPSRC =
 

 # List ASM source files here

 ASMSRC = $(PORTASM) \

-         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/vectors_md.s

+         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/vectors_md.s

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) \

diff --git a/demos/ARMCM3-STM32F103-GCC/Makefile b/demos/ARMCM3-STM32F103-GCC/Makefile
index 33e4c838b..e4c34fadb 100644
--- a/demos/ARMCM3-STM32F103-GCC/Makefile
+++ b/demos/ARMCM3-STM32F103-GCC/Makefile
@@ -60,7 +60,7 @@ CHIBIOS = ../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

 include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/port.mk

+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk

 include $(CHIBIOS)/os/kernel/kernel.mk

 include $(CHIBIOS)/test/test.mk

 

@@ -102,7 +102,7 @@ TCPPSRC =
 

 # List ASM source files here

 ASMSRC = $(PORTASM) \

-         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/vectors_md.s

+         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/vectors_md.s

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) \

diff --git a/demos/ARMCM3-STM32F107-GCC/Makefile b/demos/ARMCM3-STM32F107-GCC/Makefile
index 9ad48509b..647bdd3ce 100644
--- a/demos/ARMCM3-STM32F107-GCC/Makefile
+++ b/demos/ARMCM3-STM32F107-GCC/Makefile
@@ -60,7 +60,7 @@ CHIBIOS = ../..
 include $(CHIBIOS)/boards/ST_STM3210C_EVAL/board.mk

 include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/port.mk

+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk

 include $(CHIBIOS)/os/kernel/kernel.mk

 include $(CHIBIOS)/test/test.mk

 

@@ -102,7 +102,7 @@ TCPPSRC =
 

 # List ASM source files here

 ASMSRC = $(PORTASM) \

-         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/vectors_cl.s

+         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/vectors_cl.s

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) \

diff --git a/os/ports/GCC/ARMCMx/STM32/port.mk b/os/ports/GCC/ARMCMx/STM32/port.mk
index 52d3b912e..deb3ad1c6 100644
--- a/os/ports/GCC/ARMCMx/STM32/port.mk
+++ b/os/ports/GCC/ARMCMx/STM32/port.mk
@@ -7,5 +7,5 @@ PORTSRC = ${CHIBIOS}/os/ports/GCC/ARMCMx/chcore.c \
 PORTASM = ${CHIBIOS}/os/ports/GCC/ARMCMx/crt0_v7m.s

 

 PORTINC = ${CHIBIOS}/os/ports/GCC/ARMCMx \

-          ${CHIBIOS}/os/ports/GCC/ARMCMx/STM32F10x \

+          ${CHIBIOS}/os/ports/GCC/ARMCMx/STM32 \

           ${CHIBIOS}/os/ports/GCC/ARMCMx/cmsis

diff --git a/readme.txt b/readme.txt
index 6578167f4..8629339bd 100644
--- a/readme.txt
+++ b/readme.txt
@@ -71,6 +71,7 @@
 - FIX: DMA not initialized under some conditions (bug 3099701).

 - NEW: Added an SPI driver to the STM8 platform support.

 - NEW: Added a simple STM8 SPI demo under ./testhal/STM8/SPI.

+- CHANGE: Renamed ./os/ports/GCC/ARMCMx/STM32F10x in STM32.

 - CHANGE: Diviced the file ARMCMx/crt0.s in crt0_v6m.s and crt0_v7m.s in

   order to remove the preprocessor directives from assembler files.

 - CHANGE: Divided the file STM32/vectors.s in several files, one for each

diff --git a/testhal/STM32/ADC/Makefile b/testhal/STM32/ADC/Makefile
index 0eddf28a2..bf08c2ba9 100644
--- a/testhal/STM32/ADC/Makefile
+++ b/testhal/STM32/ADC/Makefile
@@ -60,7 +60,7 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

 include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/port.mk

+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk

 include $(CHIBIOS)/os/kernel/kernel.mk

 #include $(CHIBIOS)/test/test.mk

 

@@ -102,7 +102,7 @@ TCPPSRC =
 

 # List ASM source files here

 ASMSRC = $(PORTASM) \

-         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/vectors_md.s

+         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/vectors_md.s

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) \

diff --git a/testhal/STM32/CAN/Makefile b/testhal/STM32/CAN/Makefile
index 0eddf28a2..bf08c2ba9 100644
--- a/testhal/STM32/CAN/Makefile
+++ b/testhal/STM32/CAN/Makefile
@@ -60,7 +60,7 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

 include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/port.mk

+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk

 include $(CHIBIOS)/os/kernel/kernel.mk

 #include $(CHIBIOS)/test/test.mk

 

@@ -102,7 +102,7 @@ TCPPSRC =
 

 # List ASM source files here

 ASMSRC = $(PORTASM) \

-         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/vectors_md.s

+         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/vectors_md.s

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) \

diff --git a/testhal/STM32/PWM/Makefile b/testhal/STM32/PWM/Makefile
index 0eddf28a2..bf08c2ba9 100644
--- a/testhal/STM32/PWM/Makefile
+++ b/testhal/STM32/PWM/Makefile
@@ -60,7 +60,7 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

 include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/port.mk

+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk

 include $(CHIBIOS)/os/kernel/kernel.mk

 #include $(CHIBIOS)/test/test.mk

 

@@ -102,7 +102,7 @@ TCPPSRC =
 

 # List ASM source files here

 ASMSRC = $(PORTASM) \

-         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/vectors_md.s

+         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/vectors_md.s

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) \

diff --git a/testhal/STM32/SPI/Makefile b/testhal/STM32/SPI/Makefile
index 0eddf28a2..bf08c2ba9 100644
--- a/testhal/STM32/SPI/Makefile
+++ b/testhal/STM32/SPI/Makefile
@@ -60,7 +60,7 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

 include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/port.mk

+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk

 include $(CHIBIOS)/os/kernel/kernel.mk

 #include $(CHIBIOS)/test/test.mk

 

@@ -102,7 +102,7 @@ TCPPSRC =
 

 # List ASM source files here

 ASMSRC = $(PORTASM) \

-         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/vectors_md.s

+         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/vectors_md.s

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) \

diff --git a/testhal/STM32/UART/Makefile b/testhal/STM32/UART/Makefile
index 0eddf28a2..bf08c2ba9 100644
--- a/testhal/STM32/UART/Makefile
+++ b/testhal/STM32/UART/Makefile
@@ -60,7 +60,7 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

 include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/port.mk

+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk

 include $(CHIBIOS)/os/kernel/kernel.mk

 #include $(CHIBIOS)/test/test.mk

 

@@ -102,7 +102,7 @@ TCPPSRC =
 

 # List ASM source files here

 ASMSRC = $(PORTASM) \

-         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/vectors_md.s

+         $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/vectors_md.s

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) \