Relocated OSALs under the HAL tree, adjusted all makefiles.

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

15 files changed, 15 insertions, 15 deletions

diff --git a/demos/nil/NIL-STM32F051-DISCOVERY/Makefile b/demos/nil/NIL-STM32F051-DISCOVERY/Makefile
index 231dbe213..889bc20dc 100644
--- a/demos/nil/NIL-STM32F051-DISCOVERY/Makefile
+++ b/demos/nil/NIL-STM32F051-DISCOVERY/Makefile
@@ -74,8 +74,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/nil/osal.mk

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

-include $(CHIBIOS)/os/nil/osal/osal.mk

 include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk

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

 

diff --git a/demos/nil/NIL-STM32F100-DISCOVERY/Makefile b/demos/nil/NIL-STM32F100-DISCOVERY/Makefile
index 562fc1dfe..15d624f3b 100644
--- a/demos/nil/NIL-STM32F100-DISCOVERY/Makefile
+++ b/demos/nil/NIL-STM32F100-DISCOVERY/Makefile
@@ -79,8 +79,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32VL_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F1xx/platform.mk

+include $(CHIBIOS)/os/hal/nil/osal/osal.mk

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

-include $(CHIBIOS)/os/nil/osal/osal.mk

 include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk

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

 

diff --git a/demos/nil/NIL-STM32F303-DISCOVERY/Makefile b/demos/nil/NIL-STM32F303-DISCOVERY/Makefile
index bde9dffd6..725e17cf5 100644
--- a/demos/nil/NIL-STM32F303-DISCOVERY/Makefile
+++ b/demos/nil/NIL-STM32F303-DISCOVERY/Makefile
@@ -79,8 +79,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/osal/nil/osal.mk

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

-include $(CHIBIOS)/os/nil/osal/osal.mk

 include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

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

 

diff --git a/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile b/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile
index 80c13cd09..9be09a020 100644
--- a/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile
+++ b/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile
@@ -79,8 +79,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F37x/platform.mk

+include $(CHIBIOS)/os/hal/osal/nil/osal.mk

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

-include $(CHIBIOS)/os/nil/osal/osal.mk

 include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk

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

 

diff --git a/demos/nil/NIL-STM32L152-DISCOVERY/Makefile b/demos/nil/NIL-STM32L152-DISCOVERY/Makefile
index 48bf96351..47e6e991e 100644
--- a/demos/nil/NIL-STM32L152-DISCOVERY/Makefile
+++ b/demos/nil/NIL-STM32L152-DISCOVERY/Makefile
@@ -74,8 +74,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32L1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/nil/osal.mk

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

-include $(CHIBIOS)/os/nil/osal/osal.mk

 include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk

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

 

diff --git a/demos/rt/RT-SPC56EL-EVB/Makefile b/demos/rt/RT-SPC56EL-EVB/Makefile
index 6f3898e9c..a47bed372 100644
--- a/demos/rt/RT-SPC56EL-EVB/Makefile
+++ b/demos/rt/RT-SPC56EL-EVB/Makefile
@@ -74,8 +74,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_EVB_SPC56EL/board.mk

 include $(CHIBIOS)/os/hal/ports/SPC5/SPC56ELxx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

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

-include $(CHIBIOS)/os/rt/osal/osal.mk

 include $(CHIBIOS)/os/rt/ports/e200/compilers/GCC/mk/port_spc56elxx.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/demos/rt/RT-STM32F051-DISCOVERY/Makefile b/demos/rt/RT-STM32F051-DISCOVERY/Makefile
index 6ee0911a7..27319acea 100644
--- a/demos/rt/RT-STM32F051-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F051-DISCOVERY/Makefile
@@ -74,8 +74,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

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

-include $(CHIBIOS)/os/rt/osal/osal.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/demos/rt/RT-STM32F100-DISCOVERY/Makefile b/demos/rt/RT-STM32F100-DISCOVERY/Makefile
index 08d7ef178..e42ec06b5 100644
--- a/demos/rt/RT-STM32F100-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F100-DISCOVERY/Makefile
@@ -79,8 +79,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32VL_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

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

-include $(CHIBIOS)/os/rt/osal/osal.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile
index 851ea0b4b..283273b08 100644
--- a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile
+++ b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile
@@ -79,8 +79,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

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

-include $(CHIBIOS)/os/rt/osal/osal.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/demos/rt/RT-STM32F303-DISCOVERY/Makefile b/demos/rt/RT-STM32F303-DISCOVERY/Makefile
index 9071bc31e..ea1a9972a 100644
--- a/demos/rt/RT-STM32F303-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F303-DISCOVERY/Makefile
@@ -79,8 +79,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

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

-include $(CHIBIOS)/os/rt/osal/osal.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/demos/rt/RT-STM32F373-STM32373C_EVAL/Makefile b/demos/rt/RT-STM32F373-STM32373C_EVAL/Makefile
index 7fa47c79c..bf4820ad1 100644
--- a/demos/rt/RT-STM32F373-STM32373C_EVAL/Makefile
+++ b/demos/rt/RT-STM32F373-STM32373C_EVAL/Makefile
@@ -79,8 +79,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F37x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

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

-include $(CHIBIOS)/os/rt/osal/osal.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
index 6a1e61aa3..d6453bd77 100644
--- a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
+++ b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
@@ -79,8 +79,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

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

-include $(CHIBIOS)/os/rt/osal/osal.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/demos/rt/RT-STM32F407-DISCOVERY/Makefile b/demos/rt/RT-STM32F407-DISCOVERY/Makefile
index 6d6c54232..5e4a3e7b5 100644
--- a/demos/rt/RT-STM32F407-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F407-DISCOVERY/Makefile
@@ -79,8 +79,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

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

-include $(CHIBIOS)/os/rt/osal/osal.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/demos/rt/RT-STM32F429-DISCOVERY/Makefile b/demos/rt/RT-STM32F429-DISCOVERY/Makefile
index 376c88a3b..6d59255a4 100644
--- a/demos/rt/RT-STM32F429-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F429-DISCOVERY/Makefile
@@ -79,8 +79,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F429I_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

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

-include $(CHIBIOS)/os/rt/osal/osal.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

 include $(CHIBIOS)/test/test.mk

 

diff --git a/demos/rt/RT-STM32L152-DISCOVERY/Makefile b/demos/rt/RT-STM32L152-DISCOVERY/Makefile
index 60a9709cf..86b8cf162 100644
--- a/demos/rt/RT-STM32L152-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32L152-DISCOVERY/Makefile
@@ -74,8 +74,8 @@ CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/ports/STM32L1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

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

-include $(CHIBIOS)/os/rt/osal/osal.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk

 include $(CHIBIOS)/test/test.mk