Skip to content
Snippets Groups Projects
Commit 7c1c6ac2 authored by Joakim Nohlgård's avatar Joakim Nohlgård Committed by GitHub
Browse files

Merge pull request #7646 from aabadie/samd21_bootloader

cpu/sam0-common: rename mkr ldscript to more a generic name
parents 9964a607 282f6918
No related branches found
No related tags found
No related merge requests found
...@@ -15,8 +15,9 @@ ifeq ($(PROGRAMMER),jlink) ...@@ -15,8 +15,9 @@ ifeq ($(PROGRAMMER),jlink)
export JLINK_DEVICE := ${MKR_JLINK_DEVICE} export JLINK_DEVICE := ${MKR_JLINK_DEVICE}
include $(RIOTMAKE)/tools/jlink.inc.mk include $(RIOTMAKE)/tools/jlink.inc.mk
else else
# on default, we use BOSSA to flash this board # by default, we use BOSSA to flash this board and take into account the
export LINKER_SCRIPT ?= $(RIOTCPU)/sam0_common/ldscripts/$(CPU_MODEL)_mkr.ld # preinstalled Arduino bootloader.
export LINKER_SCRIPT ?= $(RIOTCPU)/sam0_common/ldscripts/$(CPU_MODEL)_arduino_bootloader.ld
include $(RIOTMAKE)/tools/bossa.inc.mk include $(RIOTMAKE)/tools/bossa.inc.mk
endif endif
......
### Atmel SAM0 linker scripts notes
This folder contains SAM0 CPU specific linker scripts that are used to generate
the final binary firmware.
There are 2 kinds of scripts:
* <name of cpu>.ld: used to generate a firmware that starts at the
beginning of the flash memory. The firmware is copied to the flash memory
using [OpenOCD](https://github.com/ntfreak/openocd).
* <name of cpu>\_arduino\_bootloader.ld: used to generate a firmware
that starts after a preflashed Arduino bootloader. The firmware is copied to
the flash memory using [Bossa](https://github.com/shumatech/BOSSA).
This is the kind of configuration used with Arduino MKR and Adafruit Feather
M0 boards.
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
* @{ * @{
* *
* @file * @file
* @brief Memory definitions for the SAMD21DG18A used in Arduino MKR1000 board * @brief Memory definitions for the SAMD21DG18A when used with a
* preinstalled bootloader.
* *
* @author Hauke Petersen <hauke.petersen@fu-berlin.de> * @author Hauke Petersen <hauke.petersen@fu-berlin.de>
* @author Alexandre Abadie <alexandre.abadie@inria.fr> * @author Alexandre Abadie <alexandre.abadie@inria.fr>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment