diff options
| author | Fabien Poussin <fabien.poussin@gmail.com> | 2019-10-02 16:27:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 16:27:12 +0200 |
| commit | 51910c3551c2a4232ba3defcef063e2f745f925a (patch) | |
| tree | 3991c377dbb51eba6292303761a847471efd9879 /testhal/KINETIS/MCHCK/PWM/Makefile | |
| parent | 29cdd11f63aaf8ee856551bb6a02f3486bc756ba (diff) | |
| parent | c71108e2806c8a6f10f670c5b8642a26fa28b89c (diff) | |
| download | ChibiOS-Contrib-51910c3551c2a4232ba3defcef063e2f745f925a.tar.gz ChibiOS-Contrib-51910c3551c2a4232ba3defcef063e2f745f925a.tar.bz2 ChibiOS-Contrib-51910c3551c2a4232ba3defcef063e2f745f925a.zip | |
Merge pull request #197 from ChibiOS/fixes-19.1
Updates for 19.1.x compatibliity
Diffstat (limited to 'testhal/KINETIS/MCHCK/PWM/Makefile')
| -rw-r--r-- | testhal/KINETIS/MCHCK/PWM/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testhal/KINETIS/MCHCK/PWM/Makefile b/testhal/KINETIS/MCHCK/PWM/Makefile index c2fa3a0..6d562e3 100644 --- a/testhal/KINETIS/MCHCK/PWM/Makefile +++ b/testhal/KINETIS/MCHCK/PWM/Makefile @@ -93,7 +93,7 @@ include $(CHIBIOS)/os/license/license.mk # Startup files. include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x5.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/K20x/platform.mk include $(CHIBIOS_CONTRIB)/os/hal/boards/MCHCK_K20/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk @@ -104,7 +104,7 @@ include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk # Define linker script file here # Use BLDR4 for a 4k bootloader, BLDR3 for a 3k bootloader -LDSCRIPT= $(STARTUPLD)/MK20DX128BLDR4.ld +LDSCRIPT= $(STARTUPLD_CONTRIB)/MK20DX128BLDR4.ld # C sources that can be compiled in ARM or THUMB mode depending on the global # setting. @@ -212,5 +212,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 |