From 282f691871646410ab9ee4d02eb5d16ea413674e Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Tue, 26 Sep 2017 09:32:10 +0200 Subject: [PATCH] boards/arduino-mkr-common: rename CPU to use new ldscript name --- boards/arduino-mkr-common/Makefile.include | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/boards/arduino-mkr-common/Makefile.include b/boards/arduino-mkr-common/Makefile.include index 8796cd0096..24bc32982b 100644 --- a/boards/arduino-mkr-common/Makefile.include +++ b/boards/arduino-mkr-common/Makefile.include @@ -15,8 +15,9 @@ ifeq ($(PROGRAMMER),jlink) export JLINK_DEVICE := ${MKR_JLINK_DEVICE} include $(RIOTMAKE)/tools/jlink.inc.mk else - # on default, we use BOSSA to flash this board - export LINKER_SCRIPT ?= $(RIOTCPU)/sam0_common/ldscripts/$(CPU_MODEL)_mkr.ld + # by default, we use BOSSA to flash this board and take into account the + # preinstalled Arduino bootloader. + export LINKER_SCRIPT ?= $(RIOTCPU)/sam0_common/ldscripts/$(CPU_MODEL)_arduino_bootloader.ld include $(RIOTMAKE)/tools/bossa.inc.mk endif