diff options
author | Diego Ismirlian <dismirlian@gmail.com> | 2019-10-02 11:38:05 -0300 |
---|---|---|
committer | Diego Ismirlian <dismirlian@gmail.com> | 2019-10-02 11:38:05 -0300 |
commit | 6f817a029807c07668d41b33faa3512df129710a (patch) | |
tree | 9502da2e070e245b51af4ed51b8c681fe13df416 /testhal/NRF52/NRF52832/PWM-ICU/Makefile | |
parent | d685cfd0c27252b77fe3cb5416d3921f37033e81 (diff) | |
parent | 51910c3551c2a4232ba3defcef063e2f745f925a (diff) | |
download | ChibiOS-Contrib-6f817a029807c07668d41b33faa3512df129710a.tar.gz ChibiOS-Contrib-6f817a029807c07668d41b33faa3512df129710a.tar.bz2 ChibiOS-Contrib-6f817a029807c07668d41b33faa3512df129710a.zip |
Merge branch 'master' of https://github.com/ChibiOS/ChibiOS-Contrib
Diffstat (limited to 'testhal/NRF52/NRF52832/PWM-ICU/Makefile')
-rw-r--r-- | testhal/NRF52/NRF52832/PWM-ICU/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testhal/NRF52/NRF52832/PWM-ICU/Makefile b/testhal/NRF52/NRF52832/PWM-ICU/Makefile index 237bcbe..64e30d4 100644 --- a/testhal/NRF52/NRF52832/PWM-ICU/Makefile +++ b/testhal/NRF52/NRF52832/PWM-ICU/Makefile @@ -94,7 +94,7 @@ include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf # Licensing files.
include $(CHIBIOS)/os/license/license.mk
# HAL-OSAL files (optional).
-include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS_CONTRIB)/os/hal/hal.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/NRF5/NRF52832/platform.mk
include $(CHIBIOS_CONTRIB)/os/hal/boards/NRF52-E73-2G4M04S/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
@@ -105,7 +105,7 @@ include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk #include $(CHIBIOS)/test/rt/test.mk
# Define linker script file here
-LDSCRIPT= $(STARTUPLD)/NRF52832.ld
+LDSCRIPT= $(STARTUPLD_CONTRIB)/NRF52832.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -213,7 +213,7 @@ 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
|