diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-09 08:28:26 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-09 08:28:26 +0000 |
| commit | 840b5270c879538e8aaa5ef88e153ab2a083605e (patch) | |
| tree | e24f0d8ce03d6a28d0a574c0a17839c24698480b /os/hal | |
| parent | 0e34cd051ed686263001af3a721f6858db94d072 (diff) | |
| download | ChibiOS-840b5270c879538e8aaa5ef88e153ab2a083605e.tar.gz ChibiOS-840b5270c879538e8aaa5ef88e153ab2a083605e.tar.bz2 ChibiOS-840b5270c879538e8aaa5ef88e153ab2a083605e.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6110 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/hal.mk | 22 | ||||
| -rw-r--r-- | os/hal/osal/chibios/osal.mk | 4 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F30x/platform.mk | 54 |
3 files changed, 40 insertions, 40 deletions
diff --git a/os/hal/hal.mk b/os/hal/hal.mk index 7f93a6263..c03af2056 100644 --- a/os/hal/hal.mk +++ b/os/hal/hal.mk @@ -1,15 +1,15 @@ # 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.
-HALSRC = ${CHIBIOS}/os/halnew/src/hal.c \
- ${CHIBIOS}/os/halnew/src/hal_queues.c \
- ${CHIBIOS}/os/halnew/src/adc.c \
- ${CHIBIOS}/os/halnew/src/can.c \
- ${CHIBIOS}/os/halnew/src/icu.c \
- ${CHIBIOS}/os/halnew/src/pal.c \
- ${CHIBIOS}/os/halnew/src/pwm.c \
- ${CHIBIOS}/os/halnew/src/serial.c \
- ${CHIBIOS}/os/halnew/src/spi.c \
- ${CHIBIOS}/os/halnew/src/st.c \
+HALSRC = ${CHIBIOS}/os/hal/src/hal.c \
+ ${CHIBIOS}/os/hal/src/hal_queues.c \
+ ${CHIBIOS}/os/hal/src/adc.c \
+ ${CHIBIOS}/os/hal/src/can.c \
+ ${CHIBIOS}/os/hal/src/icu.c \
+ ${CHIBIOS}/os/hal/src/pal.c \
+ ${CHIBIOS}/os/hal/src/pwm.c \
+ ${CHIBIOS}/os/hal/src/serial.c \
+ ${CHIBIOS}/os/hal/src/spi.c \
+ ${CHIBIOS}/os/hal/src/st.c \
# Required include directories
-HALINC = ${CHIBIOS}/os/halnew/include
+HALINC = ${CHIBIOS}/os/hal/include
diff --git a/os/hal/osal/chibios/osal.mk b/os/hal/osal/chibios/osal.mk index 11ecd54b3..d80e71931 100644 --- a/os/hal/osal/chibios/osal.mk +++ b/os/hal/osal/chibios/osal.mk @@ -1,5 +1,5 @@ # OSAL files.
-OSALSRC += ${CHIBIOS}/os/halnew/osal/chibios/osal.c
+OSALSRC += ${CHIBIOS}/os/hal/osal/chibios/osal.c
# Required include directories
-OSALINC += ${CHIBIOS}/os/halnew/osal/chibios
+OSALINC += ${CHIBIOS}/os/hal/osal/chibios
diff --git a/os/hal/platforms/STM32F30x/platform.mk b/os/hal/platforms/STM32F30x/platform.mk index d45dbdb83..28c011c41 100644 --- a/os/hal/platforms/STM32F30x/platform.mk +++ b/os/hal/platforms/STM32F30x/platform.mk @@ -1,30 +1,30 @@ # List of all the STM32F30x platform files.
-PLATFORMSRC = ${CHIBIOS}/os/halnew/platforms/common/ARMCMx/nvic.c \
- ${CHIBIOS}/os/halnew/platforms/STM32F30x/stm32_dma.c \
- ${CHIBIOS}/os/halnew/platforms/STM32F30x/hal_lld.c \
- ${CHIBIOS}/os/halnew/platforms/STM32F30x/adc_lld.c \
- ${CHIBIOS}/os/halnew/platforms/STM32F30x/ext_lld_isr.c \
- ${CHIBIOS}/os/halnew/platforms/STM32/can_lld.c \
- ${CHIBIOS}/os/halnew/platforms/STM32/ext_lld.c \
- ${CHIBIOS}/os/halnew/platforms/STM32/gpt_lld.c \
- ${CHIBIOS}/os/halnew/platforms/STM32/icu_lld.c \
- ${CHIBIOS}/os/halnew/platforms/STM32/pwm_lld.c \
- ${CHIBIOS}/os/halnew/platforms/STM32/st_lld.c \
- ${CHIBIOS}/os/halnew/platforms/STM32/GPIOv2/pal_lld.c \
- ${CHIBIOS}/os/halnew/platforms/STM32/I2Cv2/i2c_lld.c \
- ${CHIBIOS}/os/halnew/platforms/STM32/RTCv2/rtc_lld.c \
- ${CHIBIOS}/os/halnew/platforms/STM32/SPIv2/spi_lld.c \
- ${CHIBIOS}/os/halnew/platforms/STM32/USARTv2/serial_lld.c \
- ${CHIBIOS}/os/halnew/platforms/STM32/USARTv2/uart_lld.c \
- ${CHIBIOS}/os/halnew/platforms/STM32/USBv1/usb_lld.c
+PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/common/ARMCMx/nvic.c \
+ ${CHIBIOS}/os/hal/platforms/STM32F30x/stm32_dma.c \
+ ${CHIBIOS}/os/hal/platforms/STM32F30x/hal_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32F30x/adc_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32F30x/ext_lld_isr.c \
+ ${CHIBIOS}/os/hal/platforms/STM32/can_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32/ext_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32/gpt_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32/icu_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32/pwm_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32/st_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32/GPIOv2/pal_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32/I2Cv2/i2c_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32/RTCv2/rtc_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32/SPIv2/spi_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32/USARTv2/serial_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32/USARTv2/uart_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32/USBv1/usb_lld.c
# Required include directories
-PLATFORMINC = ${CHIBIOS}/os/halnew/platforms/common/ARMCMx \
- ${CHIBIOS}/os/halnew/platforms/STM32F30x \
- ${CHIBIOS}/os/halnew/platforms/STM32 \
- ${CHIBIOS}/os/halnew/platforms/STM32/GPIOv2 \
- ${CHIBIOS}/os/halnew/platforms/STM32/I2Cv2 \
- ${CHIBIOS}/os/halnew/platforms/STM32/RTCv2 \
- ${CHIBIOS}/os/halnew/platforms/STM32/SPIv2 \
- ${CHIBIOS}/os/halnew/platforms/STM32/USARTv2 \
- ${CHIBIOS}/os/halnew/platforms/STM32/USBv1
+PLATFORMINC = ${CHIBIOS}/os/hal/platforms/common/ARMCMx \
+ ${CHIBIOS}/os/hal/platforms/STM32F30x \
+ ${CHIBIOS}/os/hal/platforms/STM32 \
+ ${CHIBIOS}/os/hal/platforms/STM32/GPIOv2 \
+ ${CHIBIOS}/os/hal/platforms/STM32/I2Cv2 \
+ ${CHIBIOS}/os/hal/platforms/STM32/RTCv2 \
+ ${CHIBIOS}/os/hal/platforms/STM32/SPIv2 \
+ ${CHIBIOS}/os/hal/platforms/STM32/USARTv2 \
+ ${CHIBIOS}/os/hal/platforms/STM32/USBv1
|