merge from adafruit/circuitpython

5 files changed, 9 insertions, 6 deletions

diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index 7c4484a65..d583fc63f 100644
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -12,7 +12,7 @@ from sh.contrib import git
 sys.path.append("adabot")
 import adabot.github_requests as github
 
-SUPPORTED_PORTS = ["nrf", "atmel-samd", "stm32f4", "cxd56"]
+SUPPORTED_PORTS = ["nrf", "atmel-samd", "stm32f4", "cxd56", "mimxrt10xx"]
 
 BIN = ('bin',)
 UF2 = ('uf2',)
@@ -26,6 +26,7 @@ extension_by_port = {
     "atmel-samd": UF2,
     "stm32f4": BIN,
     "cxd56": SPK,
+    "mimxrt10xx": UF2,
 }
 
 # Per board overrides
diff --git a/tools/build_memory_info.py b/tools/build_memory_info.py
index f61b843ce..93b4c1e82 100644
--- a/tools/build_memory_info.py
+++ b/tools/build_memory_info.py
@@ -73,7 +73,7 @@ ram_region = regions["RAM"]
 free_flash = firmware_region - text - data
 free_ram = ram_region - data - bss
 print("{} bytes free in flash firmware space out of {} bytes ({}kB).".format(free_flash, firmware_region, firmware_region / 1024))
-print("{} bytes free in ram for heap out of {} bytes ({}kB).".format(free_ram, ram_region, ram_region / 1024))
+print("{} bytes free in ram for stack and heap out of {} bytes ({}kB).".format(free_ram, ram_region, ram_region / 1024))
 print()
 
 # Check that we have free flash space. GCC doesn't fail when the text + data
diff --git a/tools/gen_display_resources.py b/tools/gen_display_resources.py
index 781b5e69b..c08daf477 100644
--- a/tools/gen_display_resources.py
+++ b/tools/gen_display_resources.py
@@ -48,18 +48,19 @@ for c in sample_characters:
         all_characters += c
 if args.extra_characters:
     all_characters.extend(args.extra_characters)
+all_characters = "".join(sorted(set(all_characters)))
 filtered_characters = all_characters
 
 # Try to pre-load all of the glyphs. Misses will still be slow later.
-f.load_glyphs(set(all_characters))
+f.load_glyphs(set(ord(c) for c in all_characters))
 
 # Get each glyph.
-for c in all_characters:
-    g = f.get_glyph(ord(c))
-    if not g:
+for c in set(all_characters):
+    if ord(c) not in f._glyphs:
         print("Font missing character:", c, ord(c))
         filtered_characters = filtered_characters.replace(c, "")
         continue
+    g = f.get_glyph(ord(c))
     if g["shift"][1] != 0:
         raise RuntimeError("y shift")
 
diff --git a/tools/preprocess_frozen_modules.py b/tools/preprocess_frozen_modules.py
index 90ea49ca4..974ccecd1 100755
--- a/tools/preprocess_frozen_modules.py
+++ b/tools/preprocess_frozen_modules.py
@@ -35,6 +35,7 @@ def copy_and_process(in_dir, out_dir):
         # Skip library examples directory and subfolders.
         relative_path_parts = Path(root).relative_to(in_dir).parts
         if relative_path_parts and relative_path_parts[0] in ['examples', 'docs', 'tests']:
+            del subdirs[:]
             continue
 
         for file in files:
diff --git a/tools/uf2 b/tools/uf2
-Subproject 968716efd30600984139d706bcbd8ec1a1b2336
+Subproject 84da66ce62215c1daa62204f2c3fa83c05143a4