From b4dfe5e2745201a9749839b3348f2bd61b4bd098 Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Tue, 1 Oct 2019 16:12:27 +0200 Subject: Updating Makefiles for 19.1.x --- demos/NRF51/MICROBIT/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demos/NRF51/MICROBIT/Makefile') diff --git a/demos/NRF51/MICROBIT/Makefile b/demos/NRF51/MICROBIT/Makefile index dcf2705..98d52af 100644 --- a/demos/NRF51/MICROBIT/Makefile +++ b/demos/NRF51/MICROBIT/Makefile @@ -212,6 +212,6 @@ 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 -- cgit v1.2.3 From e00396f53bcfcfab7a1dfdd9cbc987932078eb0a Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Wed, 2 Oct 2019 16:10:28 +0200 Subject: NRF demos fixes --- demos/NRF51/MICROBIT/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'demos/NRF51/MICROBIT/Makefile') diff --git a/demos/NRF51/MICROBIT/Makefile b/demos/NRF51/MICROBIT/Makefile index 98d52af..64fccf6 100644 --- a/demos/NRF51/MICROBIT/Makefile +++ b/demos/NRF51/MICROBIT/Makefile @@ -93,7 +93,7 @@ include $(CHIBIOS)/os/license/license.mk # Startup files. include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf51.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/NRF51822/platform.mk include $(CHIBIOS_CONTRIB)/os/hal/boards/MICROBIT/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk @@ -107,7 +107,7 @@ include $(CHIBIOS)/test/rt/rt_test.mk include $(CHIBIOS)/test/oslib/oslib_test.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. -- cgit v1.2.3