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 /demos/STM32 | |
| 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 'demos/STM32')
| -rw-r--r-- | demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile | 8 | ||||
| -rw-r--r-- | demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile index 4e53d19..db8f2c7 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile +++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile @@ -90,8 +90,8 @@ CHIBIOS = ../../../.. # 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_CONTRIB)/os/hal/hal.mk
+include $(CHIBIOS_CONTRIB)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F429I_DISCOVERY/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
# RTOS files (optional).
@@ -116,7 +116,7 @@ CSRC = $(STARTUPSRC) \ $(CHIBIOS)/os/various/shell.c \
$(CHIBIOS)/os/hal/lib/streams/memstreams.c \
$(CHIBIOS)/os/hal/lib/streams/chprintf.c \
- $(CHIBIOS)/community/os/various/devices_lib/lcd/ili9341.c \
+ $(CHIBIOS_CONTRIB)/os/various/devices_lib/lcd/ili9341.c \
./main.c \
./wolf3d_palette.c \
./res/wolf3d_vgagraph_chunk87.c \
@@ -153,7 +153,7 @@ INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(CHIBIOS)/os/various \
$(CHIBIOS)/os/hal/lib/streams \
- $(CHIBIOS)/community/os/various/devices_lib/lcd \
+ $(CHIBIOS_CONTRIB)/os/various/devices_lib/lcd \
./res \
# eol
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile index ac6db0e..961e4ee 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile +++ b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile @@ -90,8 +90,8 @@ CHIBIOS = ../../../.. # 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_CONTRIB)/os/hal/hal.mk
+include $(CHIBIOS_CONTRIB)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F429I_DISCOVERY/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
# RTOS files (optional).
@@ -116,7 +116,7 @@ CSRC = $(STARTUPSRC) \ $(CHIBIOS)/os/various/shell.c \
$(CHIBIOS)/os/hal/lib/streams/memstreams.c \
$(CHIBIOS)/os/hal/lib/streams/chprintf.c \
- $(CHIBIOS)/community/os/various/tribuf.c \
+ $(CHIBIOS_CONTRIB)/os/various/tribuf.c \
./usbcfg.c \
./main.c \
# eol
@@ -152,7 +152,7 @@ INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(CHIBIOS)/os/various \
$(CHIBIOS)/os/hal/lib/streams \
- $(CHIBIOS)/community/os/various \
+ $(CHIBIOS_CONTRIB)/os/various \
# eol
#
|