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 --- testhal/NRF52/NRF52832/I2C/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testhal/NRF52/NRF52832/I2C/Makefile') diff --git a/testhal/NRF52/NRF52832/I2C/Makefile b/testhal/NRF52/NRF52832/I2C/Makefile index edb407e..8506153 100644 --- a/testhal/NRF52/NRF52832/I2C/Makefile +++ b/testhal/NRF52/NRF52832/I2C/Makefile @@ -203,5 +203,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 -- cgit v1.2.3 From 53cac7239cce7d61a1612a95f98b7f3def496e45 Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Wed, 2 Oct 2019 16:02:47 +0200 Subject: NRF52 testhal fixes --- testhal/NRF52/NRF52832/I2C/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testhal/NRF52/NRF52832/I2C/Makefile') diff --git a/testhal/NRF52/NRF52832/I2C/Makefile b/testhal/NRF52/NRF52832/I2C/Makefile index 8506153..7b2fa30 100644 --- a/testhal/NRF52/NRF52832/I2C/Makefile +++ b/testhal/NRF52/NRF52832/I2C/Makefile @@ -87,7 +87,7 @@ include $(CHIBIOS)/os/license/license.mk # Startup files. include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.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 @@ -98,7 +98,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. -- cgit v1.2.3