diff options
author | Uladzimir Pylinski <barthess@yandex.ru> | 2017-03-01 21:52:33 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-01 21:52:33 +0300 |
commit | 97aaabeedd53ec16147696f8b44b16ee43d86a99 (patch) | |
tree | 227c25787f5ab7b830773fec550243967512f435 | |
parent | a4d41047d538feffa4ca4199493b6fd1068e7780 (diff) | |
parent | 8974911eda3154feeba29fd680a13b84e7138e20 (diff) | |
download | ChibiOS-Contrib-97aaabeedd53ec16147696f8b44b16ee43d86a99.tar.gz ChibiOS-Contrib-97aaabeedd53ec16147696f8b44b16ee43d86a99.tar.bz2 ChibiOS-Contrib-97aaabeedd53ec16147696f8b44b16ee43d86a99.zip |
Merge pull request #113 from romainreignier/fix_ch_dependency
Fix ch dependency.
-rw-r--r-- | os/hal/ports/STM32/LLD/DMA2Dv1/hal_stm32_dma2d.c | 1 | ||||
-rw-r--r-- | os/hal/ports/STM32/LLD/LTDCv1/hal_stm32_ltdc.c | 1 | ||||
-rw-r--r-- | testhal/STM32/STM32F0xx/qei/Makefile | 2 | ||||
-rw-r--r-- | testhal/STM32/STM32F7xx/USB_MSD/Makefile | 4 |
4 files changed, 3 insertions, 5 deletions
diff --git a/os/hal/ports/STM32/LLD/DMA2Dv1/hal_stm32_dma2d.c b/os/hal/ports/STM32/LLD/DMA2Dv1/hal_stm32_dma2d.c index 6751202..b7c9b49 100644 --- a/os/hal/ports/STM32/LLD/DMA2Dv1/hal_stm32_dma2d.c +++ b/os/hal/ports/STM32/LLD/DMA2Dv1/hal_stm32_dma2d.c @@ -19,7 +19,6 @@ * @brief DMA2D/Chrom-ART driver. */ -#include "ch.h" #include "hal.h" #include "hal_stm32_dma2d.h" diff --git a/os/hal/ports/STM32/LLD/LTDCv1/hal_stm32_ltdc.c b/os/hal/ports/STM32/LLD/LTDCv1/hal_stm32_ltdc.c index f0fd289..bffa472 100644 --- a/os/hal/ports/STM32/LLD/LTDCv1/hal_stm32_ltdc.c +++ b/os/hal/ports/STM32/LLD/LTDCv1/hal_stm32_ltdc.c @@ -19,7 +19,6 @@ * @brief LCD-TFT Controller Driver. */ -#include "ch.h" #include "hal.h" #include "hal_stm32_ltdc.h" diff --git a/testhal/STM32/STM32F0xx/qei/Makefile b/testhal/STM32/STM32F0xx/qei/Makefile index 6f2e54c..6dbcf91 100644 --- a/testhal/STM32/STM32F0xx/qei/Makefile +++ b/testhal/STM32/STM32F0xx/qei/Makefile @@ -86,7 +86,7 @@ endif PROJECT = ch
# Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS
+CHIBIOS = ../../../../../ChibiOS-RT
CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
# Startup files.
include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk
diff --git a/testhal/STM32/STM32F7xx/USB_MSD/Makefile b/testhal/STM32/STM32F7xx/USB_MSD/Makefile index 912a555..8f4695f 100644 --- a/testhal/STM32/STM32F7xx/USB_MSD/Makefile +++ b/testhal/STM32/STM32F7xx/USB_MSD/Makefile @@ -175,8 +175,8 @@ MCU = cortex-m7 #TRGT = arm-elf- TRGT = arm-none-eabi- -CC = ccache $(TRGT)gcc -CPPC = ccache $(TRGT)g++ +CC = $(TRGT)gcc +CPPC = $(TRGT)g++ # Enable loading with g++ only if you need C++ runtime support. # NOTE: You can use C++ even without C++ support if you are careful. C++ # runtime support makes code size explode. |