7 files changed, 4 insertions, 44 deletions
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
index d29e2b109..781faa241 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 6b0192c77..da3e47589 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 6ed0ff552..73afb0210 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 90fb7f2dd..c2c4da615 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 cd03320ba..000000000
--- 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 cd03320ba..000000000
--- 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
index cd03320ba..cd03320ba 100644
--- a/ports/samd/boards/samd51g19a.ld
+++ b/ports/samd/boards/samd51x19a.ld