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/KINETIS/MCHCK/USB_SERIAL/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testhal/KINETIS/MCHCK/USB_SERIAL/Makefile') diff --git a/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile b/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile index 31862bd..a95cec4 100644 --- a/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile +++ b/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile @@ -218,5 +218,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 d2402f9f83143e1f9a090f11583d5c1b2da399e3 Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Wed, 2 Oct 2019 10:38:10 +0200 Subject: Kinetis linker files path --- testhal/KINETIS/MCHCK/USB_SERIAL/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testhal/KINETIS/MCHCK/USB_SERIAL/Makefile') diff --git a/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile b/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile index a95cec4..47bac03 100644 --- a/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile +++ b/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile @@ -109,7 +109,7 @@ include $(CHIBIOS)/os/various/shell/shell.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. -- cgit v1.2.3 From 638024b5496659661c732085a86f020b8aade905 Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Wed, 2 Oct 2019 13:30:35 +0200 Subject: Rest of Kinetis examples --- testhal/KINETIS/MCHCK/USB_SERIAL/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testhal/KINETIS/MCHCK/USB_SERIAL/Makefile') diff --git a/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile b/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile index 47bac03..04142e4 100644 --- a/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile +++ b/testhal/KINETIS/MCHCK/USB_SERIAL/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 -- cgit v1.2.3