From 5a8a0c3b0386a996d69f8d9026537d640a6a99dc Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 6 Mar 2025 13:48:29 -0800
Subject: [PATCH] Fix build board info

Use board mapping instead of looking for directories
---
 docs/shared_bindings_matrix.py |  2 +-
 tools/build_board_info.py      | 39 +++++++++++++++-------------------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py
index 60c2765a4d0e6..4aedd2382d5e8 100644
--- a/docs/shared_bindings_matrix.py
+++ b/docs/shared_bindings_matrix.py
@@ -362,7 +362,7 @@ def support_matrix(arg):
         if use_branded_name:
             board_name = branded_name
         else:
-            board_name = board_directory.name
+            board_name = board_id
 
         if add_chips:
             with open(board_directory / "mpconfigboard.h") as get_name:
diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index cd9a2a575612c..3572415a5b4d7 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -248,28 +248,23 @@ def generate_download_info():
 
     board_mapping = get_board_mapping()
 
-    for port in SUPPORTED_PORTS:
-        board_path = os.path.join("../ports", port, "boards")
-        for board_path in os.scandir(board_path):
-            if board_path.is_dir():
-                board_id = board_path.name
-                board_info = board_mapping[board_id]
-                for alias in [board_id] + board_info["aliases"]:
-                    alias_info = board_mapping[alias]
-                    if alias not in current_info:
-                        changes["new_boards"].append(alias)
-                        current_info[alias] = {"downloads": 0, "versions": []}
-                    new_version = {
-                        "stable": new_stable,
-                        "version": new_tag,
-                        "languages": languages,
-                        # add modules, extensions, frozen_libraries explicitly
-                        "modules": support_matrix[alias]["modules"],
-                        "extensions": support_matrix[alias]["extensions"],
-                        "frozen_libraries": support_matrix[alias]["frozen_libraries"],
-                    }
-                    current_info[alias]["downloads"] = alias_info["download_count"]
-                    current_info[alias]["versions"].append(new_version)
+    for board_id, board_info in board_mapping.items():
+        for alias in [board_id] + board_info["aliases"]:
+            alias_info = board_mapping[alias]
+            if alias not in current_info:
+                changes["new_boards"].append(alias)
+                current_info[alias] = {"downloads": 0, "versions": []}
+            new_version = {
+                "stable": new_stable,
+                "version": new_tag,
+                "languages": languages,
+                # add modules, extensions, frozen_libraries explicitly
+                "modules": support_matrix[alias]["modules"],
+                "extensions": support_matrix[alias]["extensions"],
+                "frozen_libraries": support_matrix[alias]["frozen_libraries"],
+            }
+            current_info[alias]["downloads"] = alias_info["download_count"]
+            current_info[alias]["versions"].append(new_version)
 
     changes["new_languages"] = set(languages) - previous_languages