From 2365c7cfec867ee037d01334f7d8aae82027ca48 Mon Sep 17 00:00:00 2001
From: Yurii Soldak <ysoldak@gmail.com>
Date: Sat, 6 Aug 2022 19:17:33 +0200
Subject: [PATCH] nrf52: cleanup s140v7 uf2 targets

---
 targets/nano-33-ble-s140v7-uf2.json           |  6 ++++
 targets/nrf52840-s140v7-uf2.json              | 11 ++++++
 .../{xiao-ble.ld => nrf52840-s140v7-uf2.ld}   | 35 +++++++++----------
 targets/xiao-ble.json                         | 13 ++-----
 4 files changed, 37 insertions(+), 28 deletions(-)
 create mode 100644 targets/nano-33-ble-s140v7-uf2.json
 create mode 100644 targets/nrf52840-s140v7-uf2.json
 rename targets/{xiao-ble.ld => nrf52840-s140v7-uf2.ld} (96%)
 mode change 100755 => 100644

diff --git a/targets/nano-33-ble-s140v7-uf2.json b/targets/nano-33-ble-s140v7-uf2.json
new file mode 100644
index 00000000..56d6fed3
--- /dev/null
+++ b/targets/nano-33-ble-s140v7-uf2.json
@@ -0,0 +1,6 @@
+{
+	"inherits": ["nrf52840", "nrf52840-s140v7-uf2"],
+	"build-tags": ["nano_33_ble"],
+	"serial-port": ["acm:239a:8063", "acm:239a:0063"],
+	"msd-volume-name": "NANO33BOOT"
+}
diff --git a/targets/nrf52840-s140v7-uf2.json b/targets/nrf52840-s140v7-uf2.json
new file mode 100644
index 00000000..206e446e
--- /dev/null
+++ b/targets/nrf52840-s140v7-uf2.json
@@ -0,0 +1,11 @@
+{
+	"inherits": ["nrf52840-s140v7"],
+	"build-tags": ["nrf52840_reset_uf2"],
+	"linkerscript": "targets/nrf52840-s140v7-uf2.ld",
+	"serial": "usb",
+	"flash-1200-bps-reset": "true",
+	"flash-method": "msd",
+	"msd-firmware-name": "firmware.uf2",
+	"binary-format": "uf2",
+	"uf2-family-id": "0xADA52840"
+}
diff --git a/targets/xiao-ble.ld b/targets/nrf52840-s140v7-uf2.ld
old mode 100755
new mode 100644
similarity index 96%
rename from targets/xiao-ble.ld
rename to targets/nrf52840-s140v7-uf2.ld
index e78d1613..4fee8518
--- a/targets/xiao-ble.ld
+++ b/targets/nrf52840-s140v7-uf2.ld
@@ -1,18 +1,17 @@
-
-/*
-  See also 
-  https://github.com/Seeed-Studio/ArduinoCore-mbed/blob/master/variants/SEEED_XIAO_NRF52840_SENSE/linker_script.ld
-*/
-MEMORY
-{
-    FLASH_TEXT (rx) : ORIGIN = 0x27000, LENGTH = 0xED000 - 0x27000
-    RAM (rwx) : ORIGIN = 0x20006000, LENGTH = 0x3A000
-}
-
-_stack_size = 4K + __softdevice_stack;
-
-/* This value is needed by the Nordic SoftDevice. */
-__app_ram_base = ORIGIN(RAM);
-__softdevice_stack = DEFINED(__softdevice_stack) ? __softdevice_stack : 0;
-
-INCLUDE "targets/arm.ld"
+/*
+  See also 
+  https://github.com/Seeed-Studio/ArduinoCore-mbed/blob/master/variants/SEEED_XIAO_NRF52840_SENSE/linker_script.ld
+*/
+MEMORY
+{
+    FLASH_TEXT (rx) : ORIGIN = 0x27000, LENGTH = 0xED000 - 0x27000
+    RAM (rwx) : ORIGIN = 0x20006000, LENGTH = 0x3A000
+}
+
+_stack_size = 4K + __softdevice_stack;
+
+/* This value is needed by the Nordic SoftDevice. */
+__app_ram_base = ORIGIN(RAM);
+__softdevice_stack = DEFINED(__softdevice_stack) ? __softdevice_stack : 0;
+
+INCLUDE "targets/arm.ld"
diff --git a/targets/xiao-ble.json b/targets/xiao-ble.json
index c0818f7e..a62f2e70 100644
--- a/targets/xiao-ble.json
+++ b/targets/xiao-ble.json
@@ -1,13 +1,6 @@
 {
-	"inherits": ["nrf52840"],
-	"build-tags": ["xiao_ble", "nrf52840_reset_uf2", "softdevice", "s140v7"],
-	"serial": "usb",
+	"inherits": ["nrf52840", "nrf52840-s140v7-uf2"],
+	"build-tags": ["xiao_ble"],
 	"serial-port": ["acm:2886:8045", "acm:2886:0045"],
-	"flash-1200-bps-reset": "true",
-	"flash-method": "msd",
-	"msd-volume-name": "XIAO-SENSE",
-	"msd-firmware-name": "firmware.uf2",
-	"binary-format": "uf2",
-	"uf2-family-id": "0xADA52840",
-	"linkerscript": "targets/xiao-ble.ld"
+	"msd-volume-name": "XIAO-SENSE"
 }