diff options
| author | Jim Mussared <jim.mussared@gmail.com> | 2019-08-10 15:17:09 +1000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2019-08-16 00:26:54 +1000 |
| commit | a5d85d306c430e0dbf3871971f68ed920dda4ef7 (patch) | |
| tree | c925b5bf6a2acd1df6bf33722db44a63afd2c4f0 | |
| parent | 8db517f26d236023eeb04bf9af8b1e9f1c2ccec3 (diff) | |
samd: Make common linker scripts, rename board.mk to mpconfigboard.mk.
The rename matches other ports, e.g. stm32, and gives consistency with
mpconfigboard.h.
| -rw-r--r-- | ports/samd/Makefile | 2 | ||||
| -rw-r--r-- | ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk (renamed from ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.mk) | 2 | ||||
| -rw-r--r-- | ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk (renamed from ports/samd/boards/ADAFRUIT_TRINKET_M0/board.mk) | 2 | ||||
| -rw-r--r-- | ports/samd/boards/samd21x18a.ld (renamed from ports/samd/boards/ADAFRUIT_TRINKET_M0/link.ld) | 0 | ||||
| -rw-r--r-- | ports/samd/boards/samd51g19a.ld (renamed from ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/link.ld) | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/ports/samd/Makefile b/ports/samd/Makefile index f4a09ad7c..77a53bd48 100644 --- a/ports/samd/Makefile +++ b/ports/samd/Makefile @@ -10,7 +10,7 @@ $(error Invalid BOARD specified: $(BOARD_DIR)) endif include ../../py/mkenv.mk -include $(BOARD_DIR)/board.mk +include $(BOARD_DIR)/mpconfigboard.mk # Qstr definitions (must come before including py.mk) QSTR_DEFS = qstrdefsport.h diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.mk b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk index 8cbd1885e..2e5d7e68d 100644 --- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.mk +++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk @@ -1,4 +1,4 @@ MCU_SERIES = SAMD51 CMSIS_MCU = SAMD51G19A -LD_FILES = $(BOARD_DIR)/link.ld sections.ld +LD_FILES = boards/samd51g19a.ld sections.ld TEXT0 = 0x4000 diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.mk b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk index 3955a4f71..5b4d0b63e 100644 --- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.mk +++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk @@ -1,4 +1,4 @@ MCU_SERIES = SAMD21 CMSIS_MCU = SAMD21E18A -LD_FILES = $(BOARD_DIR)/link.ld sections.ld +LD_FILES = boards/samd21x18a.ld sections.ld TEXT0 = 0x2000 diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/link.ld b/ports/samd/boards/samd21x18a.ld index b7d59c315..b7d59c315 100644 --- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/link.ld +++ b/ports/samd/boards/samd21x18a.ld diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/link.ld b/ports/samd/boards/samd51g19a.ld index e0baa9bba..e0baa9bba 100644 --- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/link.ld +++ b/ports/samd/boards/samd51g19a.ld |