Skip to content

Commit 9180f62

Browse files
will-v-piwill-v-pi
committed
Add full support for x86_64 MacOS
Adds OpenOCD, and a natively compiled Risc-V toolchain Fixes #126
1 parent 7ac5b6c commit 9180f62

File tree

5 files changed

+133
-129
lines changed

5 files changed

+133
-129
lines changed

‎data/0.17.0/github-cache.json

Lines changed: 45 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@
494494
"v2.0.0-5",
495495
"v2.1.0-0",
496496
"v2.1.1-1",
497-
"v2.1.1-2"
497+
"v2.1.1-3"
498498
],
499499
"githubApiCache-3-1-v1.5.1-0": {
500500
"assets": [
@@ -1111,95 +1111,100 @@
11111111
],
11121112
"assetsUrl": "https://api.github.com/repos/raspberrypi/pico-sdk-tools/releases/201683640/assets"
11131113
},
1114-
"githubApiCache-3-1-v2.1.1-2": {
1114+
"githubApiCache-3-1-v2.1.1-3": {
11151115
"assets": [
11161116
{
1117-
"id": 268716234,
1117+
"id": 273775272,
11181118
"name": "openocd-0.12.0+dev-aarch64-lin.tar.gz",
1119-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/openocd-0.12.0%2Bdev-aarch64-lin.tar.gz"
1119+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/openocd-0.12.0%2Bdev-aarch64-lin.tar.gz"
11201120
},
11211121
{
1122-
"id": 268706900,
1122+
"id": 273765143,
11231123
"name": "openocd-0.12.0+dev-arm64-mac.zip",
1124-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/openocd-0.12.0%2Bdev-arm64-mac.zip"
1124+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/openocd-0.12.0%2Bdev-arm64-mac.zip"
11251125
},
11261126
{
1127-
"id": 268723640,
1127+
"id": 273785185,
11281128
"name": "openocd-0.12.0+dev-x64-win.zip",
1129-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/openocd-0.12.0%2Bdev-x64-win.zip"
1129+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/openocd-0.12.0%2Bdev-x64-win.zip"
11301130
},
11311131
{
1132-
"id": 268705002,
1132+
"id": 273765304,
11331133
"name": "openocd-0.12.0+dev-x86_64-lin.tar.gz",
1134-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/openocd-0.12.0%2Bdev-x86_64-lin.tar.gz"
1134+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/openocd-0.12.0%2Bdev-x86_64-lin.tar.gz"
11351135
},
11361136
{
1137-
"id": 268716233,
1137+
"id": 273776234,
1138+
"name": "openocd-0.12.0+dev-x86_64-mac.zip",
1139+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/openocd-0.12.0%2Bdev-x86_64-mac.zip"
1140+
},
1141+
{
1142+
"id": 273775271,
11381143
"name": "pico-sdk-tools-2.1.1-aarch64-lin.tar.gz",
1139-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/pico-sdk-tools-2.1.1-aarch64-lin.tar.gz"
1144+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/pico-sdk-tools-2.1.1-aarch64-lin.tar.gz"
11401145
},
11411146
{
1142-
"id": 268706901,
1147+
"id": 273765144,
11431148
"name": "pico-sdk-tools-2.1.1-mac.zip",
1144-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/pico-sdk-tools-2.1.1-mac.zip"
1149+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/pico-sdk-tools-2.1.1-mac.zip"
11451150
},
11461151
{
1147-
"id": 268723639,
1152+
"id": 273785183,
11481153
"name": "pico-sdk-tools-2.1.1-x64-win.zip",
1149-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/pico-sdk-tools-2.1.1-x64-win.zip"
1154+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/pico-sdk-tools-2.1.1-x64-win.zip"
11501155
},
11511156
{
1152-
"id": 268705000,
1157+
"id": 273765302,
11531158
"name": "pico-sdk-tools-2.1.1-x86_64-lin.tar.gz",
1154-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/pico-sdk-tools-2.1.1-x86_64-lin.tar.gz"
1159+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/pico-sdk-tools-2.1.1-x86_64-lin.tar.gz"
11551160
},
11561161
{
1157-
"id": 268716236,
1162+
"id": 273775270,
11581163
"name": "picotool-2.1.1-aarch64-lin.tar.gz",
1159-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/picotool-2.1.1-aarch64-lin.tar.gz"
1164+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/picotool-2.1.1-aarch64-lin.tar.gz"
11601165
},
11611166
{
1162-
"id": 268706899,
1167+
"id": 273765145,
11631168
"name": "picotool-2.1.1-mac.zip",
1164-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/picotool-2.1.1-mac.zip"
1169+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/picotool-2.1.1-mac.zip"
11651170
},
11661171
{
1167-
"id": 268723638,
1172+
"id": 273785184,
11681173
"name": "picotool-2.1.1-x64-win.zip",
1169-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/picotool-2.1.1-x64-win.zip"
1174+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/picotool-2.1.1-x64-win.zip"
11701175
},
11711176
{
1172-
"id": 268705001,
1177+
"id": 273765305,
11731178
"name": "picotool-2.1.1-x86_64-lin.tar.gz",
1174-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/picotool-2.1.1-x86_64-lin.tar.gz"
1179+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/picotool-2.1.1-x86_64-lin.tar.gz"
11751180
},
11761181
{
1177-
"id": 268706898,
1178-
"name": "riscv-toolchain-14-x64-mac.zip",
1179-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/riscv-toolchain-14-x64-mac.zip"
1180-
},
1181-
{
1182-
"id": 268716235,
1182+
"id": 273775269,
11831183
"name": "riscv-toolchain-15-aarch64-lin.tar.gz",
1184-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/riscv-toolchain-15-aarch64-lin.tar.gz"
1184+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-aarch64-lin.tar.gz"
11851185
},
11861186
{
1187-
"id": 268706897,
1187+
"id": 273765142,
11881188
"name": "riscv-toolchain-15-arm64-mac.zip",
1189-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/riscv-toolchain-15-arm64-mac.zip"
1189+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-arm64-mac.zip"
11901190
},
11911191
{
1192-
"id": 268723637,
1192+
"id": 273785182,
11931193
"name": "riscv-toolchain-15-x64-win.zip",
1194-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/riscv-toolchain-15-x64-win.zip"
1194+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-x64-win.zip"
11951195
},
11961196
{
1197-
"id": 268705003,
1197+
"id": 273765303,
11981198
"name": "riscv-toolchain-15-x86_64-lin.tar.gz",
1199-
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/riscv-toolchain-15-x86_64-lin.tar.gz"
1199+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-x86_64-lin.tar.gz"
1200+
},
1201+
{
1202+
"id": 273776233,
1203+
"name": "riscv-toolchain-15-x86_64-mac.zip",
1204+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-x86_64-mac.zip"
12001205
}
12011206
],
1202-
"assetsUrl": "https://api.github.com/repos/raspberrypi/pico-sdk-tools/releases/228841726/assets"
1207+
"assetsUrl": "https://api.github.com/repos/raspberrypi/pico-sdk-tools/releases/233179600/assets"
12031208
},
12041209
"githubApiCache-4-0": [
12051210
"2.0.0",

‎data/0.17.0/supportedToolchains.ini

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ darwin_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/g
44
darwin_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-darwin-x86_64-arm-none-eabi.tar.xz
55
linux_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz
66
linux_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-aarch64-arm-none-eabi.tar.xz
7+
[RISCV_ZCB_RPI_2_1_1_3]
8+
win32_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-x64-win.zip
9+
darwin_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-arm64-mac.zip
10+
darwin_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-x86_64-mac.zip
11+
linux_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-x86_64-lin.tar.gz
12+
linux_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-aarch64-lin.tar.gz
713
[13_3_Rel1]
814
win32_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-mingw-w64-i686-arm-none-eabi.zip
915
darwin_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-darwin-arm64-arm-none-eabi.tar.xz
@@ -16,12 +22,6 @@ darwin_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/g
1622
darwin_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-darwin-x86_64-arm-none-eabi.tar.xz
1723
linux_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
1824
linux_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-eabi.tar.xz
19-
[RISCV_ZCB_RPI_2_1_1_2]
20-
win32_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/riscv-toolchain-15-x64-win.zip
21-
darwin_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/riscv-toolchain-15-arm64-mac.zip
22-
darwin_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/riscv-toolchain-15-x64-mac.zip
23-
linux_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/riscv-toolchain-15-x86_64-lin.tar.gz
24-
linux_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-2/riscv-toolchain-15-aarch64-lin.tar.gz
2525
[RISCV_RPI_2_0_0_5]
2626
win32_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-x64-win.zip
2727
darwin_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-arm64-mac.zip

‎scripts/genCache.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747

4848
# Only provide data for these versions
4949
versions = [
50-
["1.5.1", "2.0.0", "2.1.0", "2.1.1"],
51-
["v3.28.6", "v3.29.6", "v3.29.9", "v3.31.5"],
52-
["v1.12.1"],
50+
["1.5.1", "2.0.0", "2.1.0", "2.1.1"], # SDK
51+
["v3.28.6", "v3.29.6", "v3.29.9", "v3.31.5"], # CMake
52+
["v1.12.1"], # Ninja
5353
[
5454
"v1.5.1-0",
5555
"v2.0.0-0",
@@ -60,9 +60,9 @@
6060
"v2.0.0-5",
6161
"v2.1.0-0",
6262
"v2.1.1-1",
63-
"v2.1.1-2",
64-
],
65-
["2.0.0", "2.1.0", "2.1.1"],
63+
"v2.1.1-3",
64+
], # pico-sdk-tools
65+
["2.0.0", "2.1.0", "2.1.1"], # picotool
6666
]
6767

6868
headers = {

0 commit comments

Comments
 (0)