From fb4711b981f525b05454a46651f955ac276d5af4 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 1 Sep 2013 08:13:23 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6236 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile | 2 +- demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile | 2 +- demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile | 2 +- demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile | 2 +- os/{rt/ports/ARMCMx => ext}/CMSIS/include/arm_common_tables.h | 0 os/{rt/ports/ARMCMx => ext}/CMSIS/include/arm_const_structs.h | 0 os/{rt/ports/ARMCMx => ext}/CMSIS/include/arm_math.h | 0 os/{rt/ports/ARMCMx => ext}/CMSIS/include/core_cm0.h | 0 os/{rt/ports/ARMCMx => ext}/CMSIS/include/core_cm0plus.h | 0 os/{rt/ports/ARMCMx => ext}/CMSIS/include/core_cm3.h | 0 os/{rt/ports/ARMCMx => ext}/CMSIS/include/core_cm4.h | 0 os/{rt/ports/ARMCMx => ext}/CMSIS/include/core_cm4_simd.h | 0 os/{rt/ports/ARMCMx => ext}/CMSIS/include/core_cmFunc.h | 0 os/{rt/ports/ARMCMx => ext}/CMSIS/include/core_cmInstr.h | 0 os/{rt/ports/ARMCMx => ext}/CMSIS/readme.txt | 0 os/rt/ports/ARMCMx/devices/STM32F0xx/port.mk | 4 ++-- os/rt/ports/ARMCMx/devices/STM32F30x/port.mk | 4 ++-- os/rt/ports/ARMCMx/devices/STM32F4xx/port.mk | 4 ++-- 18 files changed, 10 insertions(+), 10 deletions(-) rename os/{rt/ports/ARMCMx => ext}/CMSIS/include/arm_common_tables.h (100%) rename os/{rt/ports/ARMCMx => ext}/CMSIS/include/arm_const_structs.h (100%) rename os/{rt/ports/ARMCMx => ext}/CMSIS/include/arm_math.h (100%) rename os/{rt/ports/ARMCMx => ext}/CMSIS/include/core_cm0.h (100%) rename os/{rt/ports/ARMCMx => ext}/CMSIS/include/core_cm0plus.h (100%) rename os/{rt/ports/ARMCMx => ext}/CMSIS/include/core_cm3.h (100%) rename os/{rt/ports/ARMCMx => ext}/CMSIS/include/core_cm4.h (100%) rename os/{rt/ports/ARMCMx => ext}/CMSIS/include/core_cm4_simd.h (100%) rename os/{rt/ports/ARMCMx => ext}/CMSIS/include/core_cmFunc.h (100%) rename os/{rt/ports/ARMCMx => ext}/CMSIS/include/core_cmInstr.h (100%) rename os/{rt/ports/ARMCMx => ext}/CMSIS/readme.txt (100%) diff --git a/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile b/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile index 1f8ff8d26..b0afd0421 100644 --- a/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile +++ b/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile @@ -58,7 +58,7 @@ endif PROJECT = ch # Imported source files and paths -CHIBIOS = ../.. +CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/osal/chibios/osal.mk include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk diff --git a/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile b/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile index 42aa01893..3b9345b6e 100644 --- a/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile +++ b/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile @@ -64,7 +64,7 @@ endif PROJECT = ch # Imported source files and paths -CHIBIOS = ../.. +CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/osal/chibios/osal.mk include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk diff --git a/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile index fa1a6b8a0..3968459dc 100644 --- a/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile +++ b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile @@ -64,7 +64,7 @@ endif PROJECT = ch # Imported source files and paths -CHIBIOS = ../.. +CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/osal/chibios/osal.mk include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk diff --git a/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile b/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile index beae7885a..50f0a6188 100644 --- a/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile +++ b/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile @@ -64,7 +64,7 @@ endif PROJECT = ch # Imported source files and paths -CHIBIOS = ../.. +CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/osal/chibios/osal.mk include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk diff --git a/os/rt/ports/ARMCMx/CMSIS/include/arm_common_tables.h b/os/ext/CMSIS/include/arm_common_tables.h similarity index 100% rename from os/rt/ports/ARMCMx/CMSIS/include/arm_common_tables.h rename to os/ext/CMSIS/include/arm_common_tables.h diff --git a/os/rt/ports/ARMCMx/CMSIS/include/arm_const_structs.h b/os/ext/CMSIS/include/arm_const_structs.h similarity index 100% rename from os/rt/ports/ARMCMx/CMSIS/include/arm_const_structs.h rename to os/ext/CMSIS/include/arm_const_structs.h diff --git a/os/rt/ports/ARMCMx/CMSIS/include/arm_math.h b/os/ext/CMSIS/include/arm_math.h similarity index 100% rename from os/rt/ports/ARMCMx/CMSIS/include/arm_math.h rename to os/ext/CMSIS/include/arm_math.h diff --git a/os/rt/ports/ARMCMx/CMSIS/include/core_cm0.h b/os/ext/CMSIS/include/core_cm0.h similarity index 100% rename from os/rt/ports/ARMCMx/CMSIS/include/core_cm0.h rename to os/ext/CMSIS/include/core_cm0.h diff --git a/os/rt/ports/ARMCMx/CMSIS/include/core_cm0plus.h b/os/ext/CMSIS/include/core_cm0plus.h similarity index 100% rename from os/rt/ports/ARMCMx/CMSIS/include/core_cm0plus.h rename to os/ext/CMSIS/include/core_cm0plus.h diff --git a/os/rt/ports/ARMCMx/CMSIS/include/core_cm3.h b/os/ext/CMSIS/include/core_cm3.h similarity index 100% rename from os/rt/ports/ARMCMx/CMSIS/include/core_cm3.h rename to os/ext/CMSIS/include/core_cm3.h diff --git a/os/rt/ports/ARMCMx/CMSIS/include/core_cm4.h b/os/ext/CMSIS/include/core_cm4.h similarity index 100% rename from os/rt/ports/ARMCMx/CMSIS/include/core_cm4.h rename to os/ext/CMSIS/include/core_cm4.h diff --git a/os/rt/ports/ARMCMx/CMSIS/include/core_cm4_simd.h b/os/ext/CMSIS/include/core_cm4_simd.h similarity index 100% rename from os/rt/ports/ARMCMx/CMSIS/include/core_cm4_simd.h rename to os/ext/CMSIS/include/core_cm4_simd.h diff --git a/os/rt/ports/ARMCMx/CMSIS/include/core_cmFunc.h b/os/ext/CMSIS/include/core_cmFunc.h similarity index 100% rename from os/rt/ports/ARMCMx/CMSIS/include/core_cmFunc.h rename to os/ext/CMSIS/include/core_cmFunc.h diff --git a/os/rt/ports/ARMCMx/CMSIS/include/core_cmInstr.h b/os/ext/CMSIS/include/core_cmInstr.h similarity index 100% rename from os/rt/ports/ARMCMx/CMSIS/include/core_cmInstr.h rename to os/ext/CMSIS/include/core_cmInstr.h diff --git a/os/rt/ports/ARMCMx/CMSIS/readme.txt b/os/ext/CMSIS/readme.txt similarity index 100% rename from os/rt/ports/ARMCMx/CMSIS/readme.txt rename to os/ext/CMSIS/readme.txt diff --git a/os/rt/ports/ARMCMx/devices/STM32F0xx/port.mk b/os/rt/ports/ARMCMx/devices/STM32F0xx/port.mk index 0b5c82d66..355cdcdeb 100644 --- a/os/rt/ports/ARMCMx/devices/STM32F0xx/port.mk +++ b/os/rt/ports/ARMCMx/devices/STM32F0xx/port.mk @@ -6,8 +6,8 @@ PORTSRC = ${CHIBIOS}/os/rt/ports/ARMCMx/chcore.c \ PORTASM = $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s -PORTINC = ${CHIBIOS}/os/rt/ports/ARMCMx \ - ${CHIBIOS}/os/rt/ports/ARMCMx/CMSIS/include \ +PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \ + ${CHIBIOS}/os/rt/ports/ARMCMx \ ${CHIBIOS}/os/rt/ports/ARMCMx/compilers/GCC \ ${CHIBIOS}/os/rt/ports/ARMCMx/devices/STM32F0xx diff --git a/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk b/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk index 673b97ee9..8ff32a4a3 100644 --- a/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk +++ b/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk @@ -6,8 +6,8 @@ PORTSRC = ${CHIBIOS}/os/rt/ports/ARMCMx/chcore.c \ PORTASM = $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s -PORTINC = ${CHIBIOS}/os/rt/ports/ARMCMx \ - ${CHIBIOS}/os/rt/ports/ARMCMx/CMSIS/include \ +PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \ + ${CHIBIOS}/os/rt/ports/ARMCMx \ ${CHIBIOS}/os/rt/ports/ARMCMx/compilers/GCC \ ${CHIBIOS}/os/rt/ports/ARMCMx/devices/STM32F30x diff --git a/os/rt/ports/ARMCMx/devices/STM32F4xx/port.mk b/os/rt/ports/ARMCMx/devices/STM32F4xx/port.mk index d79baad45..2e554ddcd 100644 --- a/os/rt/ports/ARMCMx/devices/STM32F4xx/port.mk +++ b/os/rt/ports/ARMCMx/devices/STM32F4xx/port.mk @@ -6,8 +6,8 @@ PORTSRC = ${CHIBIOS}/os/rt/ports/ARMCMx/chcore.c \ PORTASM = $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s -PORTINC = ${CHIBIOS}/os/rt/ports/ARMCMx \ - ${CHIBIOS}/os/rt/ports/ARMCMx/CMSIS/include \ +PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \ + ${CHIBIOS}/os/rt/ports/ARMCMx \ ${CHIBIOS}/os/rt/ports/ARMCMx/compilers/GCC \ ${CHIBIOS}/os/rt/ports/ARMCMx/devices/STM32F4xx