aboutsummaryrefslogtreecommitdiffhomepage
path: root/targets
diff options
context:
space:
mode:
authorYurii Soldak <[email protected]>2022-08-06 19:17:33 +0200
committerRon Evans <[email protected]>2022-08-07 12:58:36 +0200
commit2365c7cfec867ee037d01334f7d8aae82027ca48 (patch)
tree3c50b871d54b074713c3838377a50dae98eec6b1 /targets
parenta5d28bdcca669ade60f80fe17e664095d299be33 (diff)
downloadtinygo-2365c7cfec867ee037d01334f7d8aae82027ca48.tar.gz
tinygo-2365c7cfec867ee037d01334f7d8aae82027ca48.zip
nrf52: cleanup s140v7 uf2 targets
Diffstat (limited to 'targets')
-rw-r--r--targets/nano-33-ble-s140v7-uf2.json6
-rw-r--r--targets/nrf52840-s140v7-uf2.json11
-rw-r--r--[-rwxr-xr-x]targets/nrf52840-s140v7-uf2.ld (renamed from targets/xiao-ble.ld)35
-rw-r--r--targets/xiao-ble.json13
4 files changed, 37 insertions, 28 deletions
diff --git a/targets/nano-33-ble-s140v7-uf2.json b/targets/nano-33-ble-s140v7-uf2.json
new file mode 100644
index 000000000..56d6fed33
--- /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 000000000..206e446e7
--- /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
index e78d16131..4fee8518b 100755..100644
--- 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 c0818f7e7..a62f2e702 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"
}