diff options
| author | barthess <barthess@yandex.ru> | 2016-04-23 20:27:12 +0300 |
|---|---|---|
| committer | barthess <barthess@yandex.ru> | 2016-04-23 20:27:12 +0300 |
| commit | c35568fafc579061a8565669c106a4fcc32d8681 (patch) | |
| tree | c8d1f57d21e4dbb29199868b3000a46d607ae5f5 /testhal/STM32/STM32F3xx/EEProm/Makefile | |
| parent | e0ada4f782a0f2a190143a47da7f5811496c4723 (diff) | |
| download | ChibiOS-Contrib-c35568fafc579061a8565669c106a4fcc32d8681.tar.gz ChibiOS-Contrib-c35568fafc579061a8565669c106a4fcc32d8681.tar.bz2 ChibiOS-Contrib-c35568fafc579061a8565669c106a4fcc32d8681.zip | |
Updated Makefiles for STM32 according to
http://forum.chibios.org/phpbb/viewtopic.php?f=3&t=3301&sid=32a42f3ad6ca146ea07566e52f127d83
Diffstat (limited to 'testhal/STM32/STM32F3xx/EEProm/Makefile')
| -rw-r--r-- | testhal/STM32/STM32F3xx/EEProm/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/testhal/STM32/STM32F3xx/EEProm/Makefile b/testhal/STM32/STM32F3xx/EEProm/Makefile index 198f0d1..90ada53 100644 --- a/testhal/STM32/STM32F3xx/EEProm/Makefile +++ b/testhal/STM32/STM32F3xx/EEProm/Makefile @@ -89,7 +89,7 @@ PROJECT = ch CHIBIOS = ../../../../../ChibiOS-RT
CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
# Startup files.
-include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk
+include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk
# HAL-OSAL files (optional).
include $(CHIBIOS_CONTRIB)/os/hal/hal.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/STM32/STM32F3xx/platform.mk
@@ -97,7 +97,7 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/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
@@ -141,9 +141,11 @@ TCSRC = TCPPSRC =
# List ASM source files here
-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC =
+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
-INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
+INCDIR = $(CHIBIOS)/os/license \
+ $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(CHIBIOS)/os/various
@@ -213,5 +215,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
|