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

This commit is contained in:
gdisirio 2013-09-02 10:16:38 +00:00
parent 7ba36f20e4
commit e0887e1260
10 changed files with 15 additions and 15 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>ARMCM0-STM32F051-DISCOVERY</name> <name>RT-STM32F051-DISCOVERY</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>

View File

@ -60,10 +60,10 @@ PROJECT = ch
# Imported source files and paths # Imported source files and paths
CHIBIOS = ../../.. CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/osal/chibios/osal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk
include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk include $(CHIBIOS)/os/hal/ports/STM32F0xx/platform.mk
include $(CHIBIOS)/os/rt/rt.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)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk
include $(CHIBIOS)/test/test.mk include $(CHIBIOS)/test/test.mk

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>ARMCM4-STM32F303-DISCOVERY</name> <name>RT-STM32F303-DISCOVERY</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>

View File

@ -66,10 +66,10 @@ PROJECT = ch
# Imported source files and paths # Imported source files and paths
CHIBIOS = ../../.. CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/osal/chibios/osal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk
include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk
include $(CHIBIOS)/os/rt/rt.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)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk
include $(CHIBIOS)/test/test.mk include $(CHIBIOS)/test/test.mk

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>ARMCM4-STM32F407-DISCOVERY-MEMS</name> <name>RT-STM32F407-DISCOVERY-MEMS</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>

View File

@ -66,10 +66,10 @@ PROJECT = ch
# Imported source files and paths # Imported source files and paths
CHIBIOS = ../../.. CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/osal/chibios/osal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
include $(CHIBIOS)/os/rt/rt.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)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
include $(CHIBIOS)/test/test.mk include $(CHIBIOS)/test/test.mk

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>ARMCM4-STM32F407-DISCOVERY</name> <name>RT-STM32F407-DISCOVERY</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>

View File

@ -66,10 +66,10 @@ PROJECT = ch
# Imported source files and paths # Imported source files and paths
CHIBIOS = ../../.. CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/osal/chibios/osal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
include $(CHIBIOS)/os/rt/rt.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)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
include $(CHIBIOS)/test/test.mk include $(CHIBIOS)/test/test.mk

View File

@ -8,19 +8,19 @@
| | +--include/ - RT kernel headers. | | +--include/ - RT kernel headers.
| | +--src/ - RT kernel sources. | | +--src/ - RT kernel sources.
| | +--templates/ - RT kernel port template files. | | +--templates/ - RT kernel port template files.
| | +--ports - RT kernel port files for various architectures and | | +--ports/ - RT kernel port files.
| | compilers. | | +--osal/ - RT kernel OSAL module for HAL interface.
| +--nil/ - ChibiOS/NIL product. | +--nil/ - ChibiOS/NIL product.
| | +--include/ - Nil kernel headers. | | +--include/ - Nil kernel headers.
| | +--src/ - Nil kernel sources. | | +--src/ - Nil kernel sources.
| | +--templates/ - Nil kernel port template files. | | +--templates/ - Nil kernel port template files.
| | +--ports - Nil kernel port files for various architectures and | | +--ports/ - Nil kernel port files.
| | compilers. | | +--osal/ - Nil kernel OSAL module for HAL interface.
| +--hal/ - ChibiOS/HAL product. | +--hal/ - ChibiOS/HAL product.
| | +--include/ - HAL high level headers. | | +--include/ - HAL high level headers.
| | +--src/ - HAL high level sources. | | +--src/ - HAL high level sources.
| | +--templates/ - HAL port template files. | | +--templates/ - HAL port template files.
| | +--ports/ - HAL low level drivers implementations. | | +--ports/ - HAL port files (low level drivers implementations).
| | +--boards/ - HAL board files. | | +--boards/ - HAL board files.
| +--common/ - Files used by multiple ChibiOS products. | +--common/ - Files used by multiple ChibiOS products.
| | +--ports - Common port files for various architectures and | | +--ports - Common port files for various architectures and

View File

@ -1,5 +1,5 @@
# OSAL files. # OSAL files.
OSALSRC += ${CHIBIOS}/os/hal/osal/chibios/osal.c OSALSRC += ${CHIBIOS}/os/rt/osal/osal.c
# Required include directories # Required include directories
OSALINC += ${CHIBIOS}/os/hal/osal/chibios OSALINC += ${CHIBIOS}/os/rt/osal