From ff1b36acdc78609a835e3e20bf9897399c08806f Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 10 Aug 2013 14:56:07 +0000
Subject: [PATCH] git-svn-id:
 svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6125
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/ARMCM4-STM32F303-DISCOVERY/Makefile    |  6 +++---
 os/rt/ports/ARMCMx/devices/STM32F30x/port.mk | 20 ++++++++++----------
 os/rt/{kernel.dox => rt.dox}                 |  0
 os/rt/{kernel.mk => rt.mk}                   |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename os/rt/{kernel.dox => rt.dox} (100%)
 rename os/rt/{kernel.mk => rt.mk} (94%)

diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/Makefile b/demos/ARMCM4-STM32F303-DISCOVERY/Makefile
index 7f0e99a8e..087991465 100644
--- a/demos/ARMCM4-STM32F303-DISCOVERY/Makefile
+++ b/demos/ARMCM4-STM32F303-DISCOVERY/Makefile
@@ -69,8 +69,8 @@ include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/hal/osal/chibios/osal.mk
 include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk
-include $(CHIBIOS)/os/kernel/kernel.mk
-include $(CHIBIOS)/os/kernel/ports/ARMCMx/devices/STM32F30x/port.mk
+include $(CHIBIOS)/os/rt/rt.mk
+include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk
 include $(CHIBIOS)/test/test.mk
 
 # Define linker script file here
@@ -222,4 +222,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER
 endif
 
-include $(CHIBIOS)/os/kernel/ports/ARMCMx/compilers/GCC/rules.mk
+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/rules.mk
diff --git a/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk b/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk
index a11a1fa7b..673b97ee9 100644
--- a/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk
+++ b/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk
@@ -1,14 +1,14 @@
 # List of the ChibiOS/RT Cortex-M4 STM32F30x port files.
-PORTSRC = ${CHIBIOS}/os/kernel/ports/ARMCMx/chcore.c \
-          ${CHIBIOS}/os/kernel/ports/ARMCMx/chcore_v7m.c \
-          $(CHIBIOS)/os/kernel/ports/ARMCMx/compilers/GCC/crt0.c \
-          $(CHIBIOS)/os/kernel/ports/ARMCMx/compilers/GCC/vectors.c \
+PORTSRC = ${CHIBIOS}/os/rt/ports/ARMCMx/chcore.c \
+          ${CHIBIOS}/os/rt/ports/ARMCMx/chcore_v7m.c \
+          $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/crt0.c \
+          $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/vectors.c \
           
-PORTASM = $(CHIBIOS)/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
+PORTASM = $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
 
-PORTINC = ${CHIBIOS}/os/kernel/ports/ARMCMx \
-          ${CHIBIOS}/os/kernel/ports/ARMCMx/CMSIS/include \
-          ${CHIBIOS}/os/kernel/ports/ARMCMx/compilers/GCC \
-          ${CHIBIOS}/os/kernel/ports/ARMCMx/devices/STM32F30x
+PORTINC = ${CHIBIOS}/os/rt/ports/ARMCMx \
+          ${CHIBIOS}/os/rt/ports/ARMCMx/CMSIS/include \
+          ${CHIBIOS}/os/rt/ports/ARMCMx/compilers/GCC \
+          ${CHIBIOS}/os/rt/ports/ARMCMx/devices/STM32F30x
 
-PORTLD  = ${CHIBIOS}/os/kernel/ports/ARMCMx/compilers/GCC/ld
+PORTLD  = ${CHIBIOS}/os/rt/ports/ARMCMx/compilers/GCC/ld
diff --git a/os/rt/kernel.dox b/os/rt/rt.dox
similarity index 100%
rename from os/rt/kernel.dox
rename to os/rt/rt.dox
diff --git a/os/rt/kernel.mk b/os/rt/rt.mk
similarity index 94%
rename from os/rt/kernel.mk
rename to os/rt/rt.mk
index 9e4d0c919..b6dc526ec 100644
--- a/os/rt/kernel.mk
+++ b/os/rt/rt.mk
@@ -22,4 +22,4 @@ KERNSRC = ${CHIBIOS}/os/rt/src/chsys.c \
           ${CHIBIOS}/os/rt/src/chmempools.c
 
 # Required include directories
-KERNINC = ${CHIBIOS}/os/kernel/include
+KERNINC = ${CHIBIOS}/os/rt/include