diff options
| author | Uladzimir Pylinski <barthess@yandex.ru> | 2015-08-24 15:19:16 +0300 |
|---|---|---|
| committer | Uladzimir Pylinski <barthess@yandex.ru> | 2015-08-24 15:19:16 +0300 |
| commit | 1baa777a7e3218c15ca6782fd9174abcec4e3f9e (patch) | |
| tree | df8ae63ebded9eeab9fc816c02f713ea25b78d3b /testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile | |
| parent | e3d91636280ab201b5ad56741a43ef7c22069700 (diff) | |
| parent | 586a8a2b29f1f01074a242b30198d8c638533a00 (diff) | |
| download | ChibiOS-Contrib-1baa777a7e3218c15ca6782fd9174abcec4e3f9e.tar.gz ChibiOS-Contrib-1baa777a7e3218c15ca6782fd9174abcec4e3f9e.tar.bz2 ChibiOS-Contrib-1baa777a7e3218c15ca6782fd9174abcec4e3f9e.zip | |
Merge pull request #23 from fpoussin/master
Makefile paths rework
Diffstat (limited to 'testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile')
| -rw-r--r-- | testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile b/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile index 48376a8..3a70aad 100644 --- a/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile +++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile @@ -80,13 +80,15 @@ endif PROJECT = ch # Imported source files and paths -CHIBIOS = ../../../../.. +CHIBIOS = ../../../../../ChibiOS-RT +CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib/ChibiOS-RT +CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk # HAL-OSAL files (optional). -include $(CHIBIOS)/community/os/hal/hal.mk -include $(CHIBIOS)/community/os/hal/ports/STM32/STM32F4xx/platform.mk -include $(CHIBIOS)/community/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk +include $(CHIBIOS_CONTRIB)/os/hal/hal.mk +include $(CHIBIOS_CONTRIB)/os/hal/ports/STM32/STM32F4xx/platform.mk +include $(CHIBIOS_CONTRIB)/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk @@ -114,7 +116,7 @@ CSRC = $(STARTUPSRC) \ # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. CPPSRC = $(CHCPPSRC) \ - $(CHIBIOS)/community/os/various/memtest.cpp + $(CHIBIOS_CONTRIB)/os/various/memtest.cpp # C sources to be compiled in ARM mode regardless of the global setting. # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler @@ -143,7 +145,7 @@ INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ $(CHIBIOS)/os/various/cpp_wrappers \ $(CHIBIOS)/os/various \ - $(CHIBIOS)/community/os/various + $(CHIBIOS_CONTRIB)/os/various # # Project, sources and paths |