From a5d85d306c430e0dbf3871971f68ed920dda4ef7 Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Sat, 10 Aug 2019 15:17:09 +1000 Subject: [PATCH] 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. --- ports/samd/Makefile | 2 +- .../{board.mk => mpconfigboard.mk} | 2 +- .../boards/ADAFRUIT_TRINKET_M0/{board.mk => mpconfigboard.mk} | 2 +- .../samd/boards/{ADAFRUIT_TRINKET_M0/link.ld => samd21x18a.ld} | 0 .../{ADAFRUIT_ITSYBITSY_M4_EXPRESS/link.ld => samd51g19a.ld} | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/{board.mk => mpconfigboard.mk} (56%) rename ports/samd/boards/ADAFRUIT_TRINKET_M0/{board.mk => mpconfigboard.mk} (56%) rename ports/samd/boards/{ADAFRUIT_TRINKET_M0/link.ld => samd21x18a.ld} (100%) rename ports/samd/boards/{ADAFRUIT_ITSYBITSY_M4_EXPRESS/link.ld => samd51g19a.ld} (100%) diff --git a/ports/samd/Makefile b/ports/samd/Makefile index f4a09ad7c1..77a53bd486 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 similarity index 56% rename from ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.mk rename to ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk index 8cbd1885e4..2e5d7e68df 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 similarity index 56% rename from ports/samd/boards/ADAFRUIT_TRINKET_M0/board.mk rename to ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk index 3955a4f719..5b4d0b63e7 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 similarity index 100% rename from ports/samd/boards/ADAFRUIT_TRINKET_M0/link.ld rename to ports/samd/boards/samd21x18a.ld diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/link.ld b/ports/samd/boards/samd51g19a.ld similarity index 100% rename from ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/link.ld rename to ports/samd/boards/samd51g19a.ld