zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
gdisirio 2013-08-09 08:28:26 +00:00
parent 0e34cd051e
commit 840b5270c8
4 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demos/ARMCM4-STM32F303-DISCOVERY/Makefile
View File

@ -66,9 +66,9 @@ PROJECT = ch
# Imported source files and paths # Imported source files and paths
CHIBIOS = ../.. CHIBIOS = ../..
include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk
include $(CHIBIOS)/os/halnew/hal.mk include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/halnew/osal/chibios/osal.mk include $(CHIBIOS)/os/hal/osal/chibios/osal.mk
include $(CHIBIOS)/os/halnew/platforms/STM32F30x/platform.mk include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk
include $(CHIBIOS)/os/kernel/kernel.mk include $(CHIBIOS)/os/kernel/kernel.mk
include $(CHIBIOS)/os/kernel/ports/ARMCMx/devices/STM32F30x/port.mk include $(CHIBIOS)/os/kernel/ports/ARMCMx/devices/STM32F30x/port.mk
include $(CHIBIOS)/test/test.mk include $(CHIBIOS)/test/test.mk

22
os/hal/hal.mk
View File

@ -1,15 +1,15 @@
# List of all the ChibiOS/RT HAL files, there is no need to remove the files # List of all the ChibiOS/RT HAL files, there is no need to remove the files
# from this list, you can disable parts of the kernel by editing halconf.h. # from this list, you can disable parts of the kernel by editing halconf.h.
HALSRC = ${CHIBIOS}/os/halnew/src/hal.c \ HALSRC = ${CHIBIOS}/os/hal/src/hal.c \
${CHIBIOS}/os/halnew/src/hal_queues.c \ ${CHIBIOS}/os/hal/src/hal_queues.c \
${CHIBIOS}/os/halnew/src/adc.c \ ${CHIBIOS}/os/hal/src/adc.c \
${CHIBIOS}/os/halnew/src/can.c \ ${CHIBIOS}/os/hal/src/can.c \
${CHIBIOS}/os/halnew/src/icu.c \ ${CHIBIOS}/os/hal/src/icu.c \
${CHIBIOS}/os/halnew/src/pal.c \ ${CHIBIOS}/os/hal/src/pal.c \
${CHIBIOS}/os/halnew/src/pwm.c \ ${CHIBIOS}/os/hal/src/pwm.c \
${CHIBIOS}/os/halnew/src/serial.c \ ${CHIBIOS}/os/hal/src/serial.c \
${CHIBIOS}/os/halnew/src/spi.c \ ${CHIBIOS}/os/hal/src/spi.c \
${CHIBIOS}/os/halnew/src/st.c \ ${CHIBIOS}/os/hal/src/st.c \
# Required include directories # Required include directories
HALINC = ${CHIBIOS}/os/halnew/include HALINC = ${CHIBIOS}/os/hal/include

4
os/hal/osal/chibios/osal.mk
View File

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

54
os/hal/platforms/STM32F30x/platform.mk
View File

@ -1,30 +1,30 @@
# List of all the STM32F30x platform files. # List of all the STM32F30x platform files.
PLATFORMSRC = ${CHIBIOS}/os/halnew/platforms/common/ARMCMx/nvic.c \ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/common/ARMCMx/nvic.c \
${CHIBIOS}/os/halnew/platforms/STM32F30x/stm32_dma.c \ ${CHIBIOS}/os/hal/platforms/STM32F30x/stm32_dma.c \
${CHIBIOS}/os/halnew/platforms/STM32F30x/hal_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32F30x/hal_lld.c \
${CHIBIOS}/os/halnew/platforms/STM32F30x/adc_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32F30x/adc_lld.c \
${CHIBIOS}/os/halnew/platforms/STM32F30x/ext_lld_isr.c \ ${CHIBIOS}/os/hal/platforms/STM32F30x/ext_lld_isr.c \
${CHIBIOS}/os/halnew/platforms/STM32/can_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/can_lld.c \
${CHIBIOS}/os/halnew/platforms/STM32/ext_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/ext_lld.c \
${CHIBIOS}/os/halnew/platforms/STM32/gpt_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/gpt_lld.c \
${CHIBIOS}/os/halnew/platforms/STM32/icu_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/icu_lld.c \
${CHIBIOS}/os/halnew/platforms/STM32/pwm_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/pwm_lld.c \
${CHIBIOS}/os/halnew/platforms/STM32/st_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/st_lld.c \
${CHIBIOS}/os/halnew/platforms/STM32/GPIOv2/pal_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/GPIOv2/pal_lld.c \
${CHIBIOS}/os/halnew/platforms/STM32/I2Cv2/i2c_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/I2Cv2/i2c_lld.c \
${CHIBIOS}/os/halnew/platforms/STM32/RTCv2/rtc_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/RTCv2/rtc_lld.c \
${CHIBIOS}/os/halnew/platforms/STM32/SPIv2/spi_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/SPIv2/spi_lld.c \
${CHIBIOS}/os/halnew/platforms/STM32/USARTv2/serial_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/USARTv2/serial_lld.c \
${CHIBIOS}/os/halnew/platforms/STM32/USARTv2/uart_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/USARTv2/uart_lld.c \
${CHIBIOS}/os/halnew/platforms/STM32/USBv1/usb_lld.c ${CHIBIOS}/os/hal/platforms/STM32/USBv1/usb_lld.c
# Required include directories # Required include directories
PLATFORMINC = ${CHIBIOS}/os/halnew/platforms/common/ARMCMx \ PLATFORMINC = ${CHIBIOS}/os/hal/platforms/common/ARMCMx \
${CHIBIOS}/os/halnew/platforms/STM32F30x \ ${CHIBIOS}/os/hal/platforms/STM32F30x \
${CHIBIOS}/os/halnew/platforms/STM32 \ ${CHIBIOS}/os/hal/platforms/STM32 \
${CHIBIOS}/os/halnew/platforms/STM32/GPIOv2 \ ${CHIBIOS}/os/hal/platforms/STM32/GPIOv2 \
${CHIBIOS}/os/halnew/platforms/STM32/I2Cv2 \ ${CHIBIOS}/os/hal/platforms/STM32/I2Cv2 \
${CHIBIOS}/os/halnew/platforms/STM32/RTCv2 \ ${CHIBIOS}/os/hal/platforms/STM32/RTCv2 \
${CHIBIOS}/os/halnew/platforms/STM32/SPIv2 \ ${CHIBIOS}/os/hal/platforms/STM32/SPIv2 \
${CHIBIOS}/os/halnew/platforms/STM32/USARTv2 \ ${CHIBIOS}/os/hal/platforms/STM32/USARTv2 \
${CHIBIOS}/os/halnew/platforms/STM32/USBv1 ${CHIBIOS}/os/hal/platforms/STM32/USBv1