diff options
| author | Diego Ismirlian <dismirlian@gmail.com> | 2019-10-02 15:31:37 -0300 |
|---|---|---|
| committer | Diego Ismirlian <dismirlian@gmail.com> | 2019-10-02 15:31:37 -0300 |
| commit | d77e8fbd524e6c3ff67769623276419f7a8d14ba (patch) | |
| tree | fd6ff77aae129045d1b1f9a5c90795fa53b7bc55 /testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile | |
| parent | ce48812834ed2835adc80da7fa6dc463d310774e (diff) | |
| parent | 2cd41f99df0fc857afaef091ca3b984a728d0e3c (diff) | |
| download | ChibiOS-Contrib-d77e8fbd524e6c3ff67769623276419f7a8d14ba.tar.gz ChibiOS-Contrib-d77e8fbd524e6c3ff67769623276419f7a8d14ba.tar.bz2 ChibiOS-Contrib-d77e8fbd524e6c3ff67769623276419f7a8d14ba.zip | |
Merge branch 'master' into segger_systemview
Diffstat (limited to 'testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile')
| -rw-r--r-- | testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile index 7327b35..f6b8b07 100644 --- a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile +++ b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile @@ -93,7 +93,7 @@ include $(CHIBIOS)/os/license/license.mk # Startup files.
include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk
# HAL-OSAL files (optional).
-include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS_CONTRIB)/os/hal/hal.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/KINETIS/KL2x/platform.mk
include $(CHIBIOS_CONTRIB)/os/hal/boards/FREESCALE_FREEDOM_KL26Z/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
@@ -108,7 +108,7 @@ include $(CHIBIOS)/os/hal/lib/streams/streams.mk include $(CHIBIOS)/os/various/shell/shell.mk
# Define linker script file here
-LDSCRIPT= $(STARTUPLD)/MKL2xZ128.ld
+LDSCRIPT= $(STARTUPLD_CONTRIB)/MKL2xZ128.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -215,5 +215,5 @@ ULIBS = # End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/rules.mk
|