diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-02-18 12:05:17 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-02-18 12:05:17 +0000 |
| commit | d7d709ee5a1fd389602ac48735d17e7b7f421fec (patch) | |
| tree | 4ee7afc77ff8b36314930ace0ff87e61a4218c77 /testhal/STM32/STM32F1xx/SPI/Makefile | |
| parent | 84f7aa84b3a62ecc4ffc940bca7f220f48e99107 (diff) | |
| download | ChibiOS-d7d709ee5a1fd389602ac48735d17e7b7f421fec.tar.gz ChibiOS-d7d709ee5a1fd389602ac48735d17e7b7f421fec.tar.bz2 ChibiOS-d7d709ee5a1fd389602ac48735d17e7b7f421fec.zip | |
Continue merge of RT4/NIL2.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8908 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32/STM32F1xx/SPI/Makefile')
| -rw-r--r-- | testhal/STM32/STM32F1xx/SPI/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testhal/STM32/STM32F1xx/SPI/Makefile b/testhal/STM32/STM32F1xx/SPI/Makefile index af2021a01..208851766 100644 --- a/testhal/STM32/STM32F1xx/SPI/Makefile +++ b/testhal/STM32/STM32F1xx/SPI/Makefile @@ -69,7 +69,7 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),) USE_EXCEPTIONS_STACKSIZE = 0x400
endif
-# Enables the use of FPU on Cortex-M4 (no, softfp, hard).
+# Enables the use of FPU (no, softfp, hard).
ifeq ($(USE_FPU),)
USE_FPU = no
endif
@@ -88,7 +88,7 @@ PROJECT = ch # Imported source files and paths
CHIBIOS = ../../../..
# Startup files.
-include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
+include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
# HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
@@ -96,7 +96,7 @@ include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk
# RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
#include $(CHIBIOS)/test/rt/test.mk
@@ -212,5 +212,5 @@ ULIBS = # End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
include $(RULESPATH)/rules.mk
|