summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorKevin Banks <kevin@firia.com>2021-02-03 16:48:28 -0600
committerKevin Banks <kevin@firia.com>2021-02-03 16:48:28 -0600
commit215a56c920b64d522e505d20e1480859fd0ea333 (patch)
tree1bee95771e6aeeb459eedb1837382f0431bd565b /tools
parent00926b687a619f18deb08c1f59f868a4e9b8514a (diff)
parentadaf43d6d84a49c382fd6fab3cb96da33aff02e4 (diff)
Merge branch 'main' into webusb (trying to get CI back online)
Diffstat (limited to 'tools')
-rw-r--r--tools/build_board_info.py3
-rw-r--r--tools/build_memory_info.py4
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index ce9d45fe2..70d5e2bc7 100644
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -26,6 +26,7 @@ SUPPORTED_PORTS = [
"litex",
"mimxrt10xx",
"nrf",
+ "raspberrypi",
"stm",
]
@@ -47,6 +48,7 @@ extension_by_port = {
"mimxrt10xx": HEX_UF2,
"litex": DFU,
"esp32s2": BIN_UF2,
+ "raspberrypi": UF2,
}
# Per board overrides
@@ -269,6 +271,7 @@ def generate_download_info():
info = current_info[board]
for version in info["versions"]:
previous_releases.add(version["version"])
+ previous_languages.update(version["languages"])
if version["stable"] == new_stable or (
new_stable and version["version"].startswith(this_version)
):
diff --git a/tools/build_memory_info.py b/tools/build_memory_info.py
index 26697b974..89aedf0f4 100644
--- a/tools/build_memory_info.py
+++ b/tools/build_memory_info.py
@@ -9,10 +9,10 @@ import re
import sys
# Handle size constants with K or M suffixes (allowed in .ld but not in Python).
-K_PATTERN = re.compile(r'([0-9]+)K')
+K_PATTERN = re.compile(r'([0-9]+)[kK]')
K_REPLACE = r'(\1*1024)'
-M_PATTERN = re.compile(r'([0-9]+)M')
+M_PATTERN = re.compile(r'([0-9]+)[mM]')
M_REPLACE = r'(\1*1024*1024)'
print()