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/NRF51/NRF51822/RNG/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/NRF51/NRF51822/RNG/Makefile')
-rw-r--r-- | testhal/NRF51/NRF51822/RNG/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testhal/NRF51/NRF51822/RNG/Makefile b/testhal/NRF51/NRF51822/RNG/Makefile index 4a71207..e2094ad 100644 --- a/testhal/NRF51/NRF51822/RNG/Makefile +++ b/testhal/NRF51/NRF51822/RNG/Makefile @@ -105,7 +105,7 @@ include $(CHIBIOS)/os/hal/lib/streams/streams.mk # Define linker script file here
-LDSCRIPT= $(STARTUPLD)/NRF51822.ld
+LDSCRIPT= $(STARTUPLD_CONTRIB)/NRF51822.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -209,7 +209,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
|