From a5d85d306c430e0dbf3871971f68ed920dda4ef7 Mon Sep 17 00:00:00 2001
From: Jim Mussared
Date: Sat, 10 Aug 2019 15:17:09 +1000
Subject: 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 +-
 .../samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.mk  |  4 ----
 ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/link.ld | 17 -----------------
 .../ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk      |  4 ++++
 ports/samd/boards/ADAFRUIT_TRINKET_M0/board.mk          |  4 ----
 ports/samd/boards/ADAFRUIT_TRINKET_M0/link.ld           | 17 -----------------
 ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk  |  4 ++++
 ports/samd/boards/samd21x18a.ld                         | 17 +++++++++++++++++
 ports/samd/boards/samd51g19a.ld                         | 17 +++++++++++++++++
 9 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.mk
 delete mode 100644 ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/link.ld
 create mode 100644 ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
 delete mode 100644 ports/samd/boards/ADAFRUIT_TRINKET_M0/board.mk
 delete mode 100644 ports/samd/boards/ADAFRUIT_TRINKET_M0/link.ld
 create mode 100644 ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk
 create mode 100644 ports/samd/boards/samd21x18a.ld
 create mode 100644 ports/samd/boards/samd51g19a.ld

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/board.mk
deleted file mode 100644
index 8cbd1885e..000000000
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-MCU_SERIES = SAMD51
-CMSIS_MCU = SAMD51G19A
-LD_FILES = $(BOARD_DIR)/link.ld sections.ld
-TEXT0 = 0x4000
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/link.ld b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/link.ld
deleted file mode 100644
index e0baa9bba..000000000
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/link.ld
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-    GNU linker script for SAMD51
-*/
-
-/* Specify the memory areas */
-MEMORY
-{
-    FLASH (rx)  : ORIGIN = 0x00004000, LENGTH = 512K - 16K
-    RAM (xrw)   : ORIGIN = 0x20000000, LENGTH = 192K
-}
-
-/* Top end of the stack, with room for double-tap variable */
-_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
-_sstack = _estack - 16K;
-
-_sheap = _ebss;
-_eheap = _sstack;
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
new file mode 100644
index 000000000..2e5d7e68d
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
@@ -0,0 +1,4 @@
+MCU_SERIES = SAMD51
+CMSIS_MCU = SAMD51G19A
+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/board.mk
deleted file mode 100644
index 3955a4f71..000000000
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-MCU_SERIES = SAMD21
-CMSIS_MCU = SAMD21E18A
-LD_FILES = $(BOARD_DIR)/link.ld sections.ld
-TEXT0 = 0x2000
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/link.ld b/ports/samd/boards/ADAFRUIT_TRINKET_M0/link.ld
deleted file mode 100644
index b7d59c315..000000000
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/link.ld
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-    GNU linker script for SAMD21
-*/
-
-/* Specify the memory areas */
-MEMORY
-{
-    FLASH (rx)  : ORIGIN = 0x00002000, LENGTH = 256K - 8K
-    RAM (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
-}
-
-/* Top end of the stack, with room for double-tap variable */
-_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
-_sstack = _estack - 8K;
-
-_sheap = _ebss;
-_eheap = _sstack;
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk
new file mode 100644
index 000000000..5b4d0b63e
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk
@@ -0,0 +1,4 @@
+MCU_SERIES = SAMD21
+CMSIS_MCU = SAMD21E18A
+LD_FILES = boards/samd21x18a.ld sections.ld
+TEXT0 = 0x2000
diff --git a/ports/samd/boards/samd21x18a.ld b/ports/samd/boards/samd21x18a.ld
new file mode 100644
index 000000000..b7d59c315
--- /dev/null
+++ b/ports/samd/boards/samd21x18a.ld
@@ -0,0 +1,17 @@
+/*
+    GNU linker script for SAMD21
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)  : ORIGIN = 0x00002000, LENGTH = 256K - 8K
+    RAM (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
+}
+
+/* Top end of the stack, with room for double-tap variable */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
+_sstack = _estack - 8K;
+
+_sheap = _ebss;
+_eheap = _sstack;
diff --git a/ports/samd/boards/samd51g19a.ld b/ports/samd/boards/samd51g19a.ld
new file mode 100644
index 000000000..e0baa9bba
--- /dev/null
+++ b/ports/samd/boards/samd51g19a.ld
@@ -0,0 +1,17 @@
+/*
+    GNU linker script for SAMD51
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)  : ORIGIN = 0x00004000, LENGTH = 512K - 16K
+    RAM (xrw)   : ORIGIN = 0x20000000, LENGTH = 192K
+}
+
+/* Top end of the stack, with room for double-tap variable */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
+_sstack = _estack - 16K;
+
+_sheap = _ebss;
+_eheap = _sstack;
-- 
cgit v1.2.3