From 65f99e371d3459cdaca4ae01895e706ff93ab285 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 2 Jul 2022 16:36:11 +0200
Subject: [PATCH] samd/boards: Use the same linker file for all SAMD51x19
 variants.

---
 .../mpconfigboard.mk                          |  2 +-
 .../mpconfigboard.mk                          |  2 +-
 ports/samd/boards/MINISAM_M4/mpconfigboard.mk |  2 +-
 .../SEEED_WIO_TERMINAL/mpconfigboard.mk       |  2 +-
 ports/samd/boards/samd51j19a.ld               | 20 -------------------
 ports/samd/boards/samd51p19a.ld               | 20 -------------------
 .../boards/{samd51g19a.ld => samd51x19a.ld}   |  0
 7 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 ports/samd/boards/samd51j19a.ld
 delete mode 100644 ports/samd/boards/samd51p19a.ld
 rename ports/samd/boards/{samd51g19a.ld => samd51x19a.ld} (100%)

diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
index d29e2b1097..781faa2410 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
@@ -1,6 +1,6 @@
 MCU_SERIES = SAMD51
 CMSIS_MCU = SAMD51J19A
-LD_FILES = boards/samd51j19a.ld sections.ld
+LD_FILES = boards/samd51x19a.ld sections.ld
 TEXT0 = 0x4000
 
 # The ?='s allow overriding in mpconfigboard.mk.
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
index 6b0192c77b..da3e47589a 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
@@ -1,6 +1,6 @@
 MCU_SERIES = SAMD51
 CMSIS_MCU = SAMD51G19A
-LD_FILES = boards/samd51g19a.ld sections.ld
+LD_FILES = boards/samd51x19a.ld sections.ld
 TEXT0 = 0x4000
 
 # The ?='s allow overriding in mpconfigboard.mk.
diff --git a/ports/samd/boards/MINISAM_M4/mpconfigboard.mk b/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
index 6ed0ff552b..73afb02104 100644
--- a/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
+++ b/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
@@ -1,7 +1,7 @@
 # https://www.minifigboards.com/mini-sam-m4/mini-sam-m4-hardware/
 MCU_SERIES = SAMD51
 CMSIS_MCU = SAMD51G19A
-LD_FILES = boards/samd51g19a.ld sections.ld
+LD_FILES = boards/samd51x19a.ld sections.ld
 TEXT0 = 0x4000
 
 # The ?='s allow overriding in mpconfigboard.mk.
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
index 90fb7f2dd0..c2c4da6152 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
@@ -1,6 +1,6 @@
 MCU_SERIES = SAMD51
 CMSIS_MCU = SAMD51P19A
-LD_FILES = boards/samd51p19a.ld sections.ld
+LD_FILES = boards/samd51x19a.ld sections.ld
 TEXT0 = 0x4000
 
 # The ?='s allow overriding in mpconfigboard.mk.
diff --git a/ports/samd/boards/samd51j19a.ld b/ports/samd/boards/samd51j19a.ld
deleted file mode 100644
index cd03320ba4..0000000000
--- a/ports/samd/boards/samd51j19a.ld
+++ /dev/null
@@ -1,20 +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;
-
-_oflash_fs = ORIGIN(FLASH) + 384K - 16K;
-_sflash_fs = LENGTH(FLASH) - 384K + 16K - 1;
-
-_sheap = _ebss;
-_eheap = _sstack;
diff --git a/ports/samd/boards/samd51p19a.ld b/ports/samd/boards/samd51p19a.ld
deleted file mode 100644
index cd03320ba4..0000000000
--- a/ports/samd/boards/samd51p19a.ld
+++ /dev/null
@@ -1,20 +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;
-
-_oflash_fs = ORIGIN(FLASH) + 384K - 16K;
-_sflash_fs = LENGTH(FLASH) - 384K + 16K - 1;
-
-_sheap = _ebss;
-_eheap = _sstack;
diff --git a/ports/samd/boards/samd51g19a.ld b/ports/samd/boards/samd51x19a.ld
similarity index 100%
rename from ports/samd/boards/samd51g19a.ld
rename to ports/samd/boards/samd51x19a.ld