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/KINETIS | |
| 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/KINETIS')
| -rw-r--r-- | testhal/KINETIS/ADC/Makefile | 6 | ||||
| -rw-r--r-- | testhal/KINETIS/I2C/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/testhal/KINETIS/ADC/Makefile b/testhal/KINETIS/ADC/Makefile index 104981773..d438436b7 100644 --- a/testhal/KINETIS/ADC/Makefile +++ b/testhal/KINETIS/ADC/Makefile @@ -82,13 +82,13 @@ PROJECT = ch # Imported source files and paths
CHIBIOS = ../../..
-include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_kl2x.mk
+include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/ports/KINETIS/KL2x/platform.mk
include $(CHIBIOS)/os/hal/boards/FREESCALE_FREEDOM_KL25Z/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/KL25Z128.ld
@@ -201,5 +201,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
diff --git a/testhal/KINETIS/I2C/Makefile b/testhal/KINETIS/I2C/Makefile index 1b5e5fb21..9935923ec 100644 --- a/testhal/KINETIS/I2C/Makefile +++ b/testhal/KINETIS/I2C/Makefile @@ -83,13 +83,13 @@ PROJECT = ch # Imported source files and paths
CHIBIOS = ../../..
-include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_k20x.mk
+include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/ports/KINETIS/K20x/platform.mk
include $(CHIBIOS)/os/hal/boards/FREESCALE_FREEDOM_K20D50M/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
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
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/MK20DX128.ld
@@ -202,5 +202,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
|