Update to Pico SDK 2.2.0

.bazelrc

@@ -4,3 +4,7 @@ common --host_per_file_copt=external/.*@-w
 
 # Produce useful output when the build fails.
 common --verbose_failures
+
+# Silence warnings about old bazel_dep pins. Bazel 8 brings along newer ones,
+# but we can support Bazel 7 (for now).
+common --check_direct_dependencies=off

.bazelversion

@@ -1 +1 @@
-7.2.1
+8.1.0

.github/workflows/check_board.yml

@@ -0,0 +1,27 @@
+name: Check Board Headers
+
+on:
+  push:
+    paths:
+      - 'src/boards/include/boards/**'
+      - 'tools/check_board_header.py'
+      - 'tools/check_all_board_headers.sh'
+      - '.github/workflows/check_board.yml'
+  pull_request:
+    paths:
+      - 'src/boards/include/boards/**'
+      - 'tools/check_board_header.py'
+      - 'tools/check_all_board_headers.sh'
+      - '.github/workflows/check_board.yml'
+
+jobs:
+  check-board-headers:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check Board Headers
+        run: |
+          tools/check_all_board_headers.sh

.github/workflows/check_configs.yml

@@ -0,0 +1,33 @@
+name: Check Configs
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  check-configs:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check Build Defines
+        if: always()
+        run: |
+          tools/extract_build_defines.py .
+
+      - name: Check CMake Configs
+        if: always()
+        run: |
+          tools/extract_cmake_configs.py .
+
+      - name: Check CMake Functions
+        if: always()
+        run: |
+          tools/extract_cmake_functions.py .
+
+      - name: Check Configs
+        if: always()
+        run: |
+          tools/extract_configs.py .

.github/workflows/choco_packages.config

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="gcc-arm-embedded" version="10.2.1" />
-  <package id="cmake" version="3.31.0" installArguments="ADD_CMAKE_TO_PATH=System" />
   <package id="mingw" version="12.2.0" />
-  <package id="ninja" version="1.11.1" />
 </packages>

.github/workflows/cmake.yml

@@ -26,7 +26,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Checkout submodules
-      run: git submodule update --init
+      run: git submodule update --init --recursive
 
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory

.github/workflows/pr-check.yml

@@ -0,0 +1,28 @@
+name: Make sure PRs target the develop branch
+
+on:
+  pull_request_target:
+
+# By default, pull_request_target gets write permissions to the repo - this prevents that
+permissions:
+  pull-requests: write
+
+jobs:
+  check-branch:
+    if: github.event.pull_request.base.ref == 'master'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add comment
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: 'Please do not submit against `master`, use `develop` instead'
+            })
+      - name: Throw error
+        run: |
+          echo "::error title=wrong-branch::Please do not submit against 'master', use 'develop' instead"
+          exit 1

.github/workflows/scripts/generate_multi_gcc_workflow.py

@@ -5,15 +5,52 @@
 import subprocess
 import re
 
-toolchain_dir = "/opt/arm"
-toolchains = os.listdir(toolchain_dir)
+toolchains = [os.path.join("/opt/arm", x) for x in os.listdir("/opt/arm")]
+toolchains += [os.path.join("/opt/riscv", x) for x in os.listdir("/opt/riscv")]
 
-gcc_versions = OrderedDict()
+compilers = []
+class Compiler:
+    def __init__(self, version, path, type):
+        self.version = version
+        self.path = path
+        self.type = type
 
+    @property
+    def gcc(self):
+        return self.type == "GCC"
+
+    @property
+    def llvm(self):
+        return self.type == "LLVM"
+
+    @property
+    def riscv(self):
+        return "RISCV" in self.type
+
+    def __repr__(self):
+        return self.version
+
+seen_versions = []
 for toolchain in toolchains:
-    fullpath = os.path.join(toolchain_dir, toolchain)
-    gcc_path = os.path.join(fullpath, "bin/arm-none-eabi-gcc")
-    version = subprocess.run([gcc_path, "--version"], capture_output=True)
+    gcc_path = os.path.join(toolchain, "bin/arm-none-eabi-gcc")
+    llvm_path = os.path.join(toolchain, "bin/clang")
+    riscv_gcc_path = os.path.join(toolchain, "bin/riscv32-unknown-elf-gcc")
+
+    type = None
+    path = None
+    if os.path.exists(gcc_path):
+        path = gcc_path
+        type = "GCC"
+    elif os.path.exists(llvm_path):
+        path = llvm_path
+        type = "LLVM"
+    elif os.path.exists(riscv_gcc_path):
+        path = riscv_gcc_path
+        type = "RISCV GCC"
+    else:
+        raise Exception("Unknown compiler type")
+
+    version = subprocess.run([path, "--version"], capture_output=True)
     stdout = version.stdout.decode('utf-8')
     stderr = version.stderr.decode('utf-8')
     assert(len(stderr) == 0)
@@ -23,14 +60,13 @@
     assert(m is not None)
     version = m.group(1)
 
-    if version in gcc_versions:
-        raise Exception("Already have version {} in versions current path {}, this path {}".format(version, gcc_versions[version], fullpath))
-
-    gcc_versions[version] = fullpath
+    if version in seen_versions:
+        raise Exception("Already have version {} in versions current path {}, this path {}".format(version, gcc_versions[version], path))
 
-# Sort by major version
-gcc_versions_sorted = OrderedDict(sorted(gcc_versions.items(), key=lambda item: int(item[0].replace(".", ""))))
+    compilers.append(Compiler(version, toolchain, type))
+    seen_versions.append(version)
 
+compilers_sorted = sorted(compilers, key=lambda x: int(x.version.replace(".", "")))
 
 # Create output
 output = '''
@@ -59,14 +95,55 @@
 
     - name: Checkout submodules
       run: git submodule update --init
+
+    - name: Host Release
+      run: cd ${{github.workspace}}; mkdir -p build; rm -rf build/*; cd build; cmake ../ -DPICO_SDK_TESTS_ENABLED=1 -DCMAKE_BUILD_TYPE=Release -DPICO_NO_PICOTOOL=1 -DPICO_PLATFORM=host; make --output-sync=target --no-builtin-rules --no-builtin-variables -j$(nproc)
+
+    - name: Host Debug
+      run: cd ${{github.workspace}}; mkdir -p build; rm -rf build/*; cd build; cmake ../ -DPICO_SDK_TESTS_ENABLED=1 -DCMAKE_BUILD_TYPE=Debug -DPICO_NO_PICOTOOL=1 -DPICO_PLATFORM=host; make --output-sync=target --no-builtin-rules --no-builtin-variables -j$(nproc)
 '''
 
-for gcc_version, toolchain_path in gcc_versions_sorted.items():
-    for build_type in ["Debug", "Release"]:
-        output += "\n"
-        output += "    - name: GCC {} {}\n".format(gcc_version, build_type)
-        output += "      if: always()\n"
-        output += "      shell: bash\n"
-        output += "      run: cd ${{{{github.workspace}}}}; mkdir -p build; rm -rf build/*; cd build; cmake ../ -DPICO_SDK_TESTS_ENABLED=1 -DCMAKE_BUILD_TYPE={} -DPICO_TOOLCHAIN_PATH={} -DPICO_BOARD=pico_w; make --output-sync=target --no-builtin-rules --no-builtin-variables -j$(nproc)\n".format(build_type, toolchain_path)
+platforms = []
+class Platform:
+    def __init__(self, name, platform, board, minimum_gcc_version=None):
+        self.name = name
+        self.board = board
+        self.platform = platform
+        self.riscv = "riscv" in platform
+        self.minimum_gcc_version = minimum_gcc_version
+
+    def cmake_string(self, compiler):
+        opts = []
+        # Temporary while private repo
+        opts.append("-DPICO_NO_PICOTOOL=1")
+        if self.board: opts.append(f"-DPICO_BOARD={self.board}")
+        opts.append(f"-DPICO_PLATFORM={self.platform}")
+        if compiler.llvm: opts.append("-DPICO_COMPILER=pico_arm_clang")
+        opts.append(f"-DPICO_TOOLCHAIN_PATH={compiler.path}")
+        return " ".join(opts)
+
+    def compiler_valid(self, compiler):
+        if compiler.riscv != self.riscv:
+            return False
+
+        if self.minimum_gcc_version and compiler.gcc:
+            if int(compiler.version.split(".")[0]) < self.minimum_gcc_version:
+                return False
 
+        return True
+
+
+platforms.append(Platform("Pico W", "rp2040", "pico_w"))
+platforms.append(Platform("RP2350", "rp2350", None, 9))
+platforms.append(Platform("RP2350 RISCV", "rp2350-riscv", None))
+
+for compiler in compilers_sorted:
+    for build_type in ["Debug", "Release"]:
+        for p in platforms:
+            if not p.compiler_valid(compiler): continue
+            output += "\n"
+            output += "    - name: {} {} {} {}\n".format(compiler.type, compiler.version, build_type, p.name)
+            output += "      if: always()\n"
+            output += "      shell: bash\n"
+            output += "      run: cd ${{{{github.workspace}}}}; mkdir -p build; rm -rf build/*; cd build; cmake ../ -DPICO_SDK_TESTS_ENABLED=1 -DCMAKE_BUILD_TYPE={} {}; make --output-sync=target --no-builtin-rules --no-builtin-variables -j$(nproc)\n".format(build_type, p.cmake_string(compiler))
 print(output)

MODULE.bazel

@@ -1,12 +1,12 @@
 module(
     name = "pico-sdk",
-    version = "2.1.0",
+    version = "2.2.0",
 )
 
 bazel_dep(name = "platforms", version = "0.0.9")
 bazel_dep(name = "bazel_skylib", version = "1.6.1")
 bazel_dep(name = "rules_python", version = "0.36.0")
-bazel_dep(name = "picotool", version = "2.1.0")
+bazel_dep(name = "picotool", version = "2.2.0")
 bazel_dep(name = "rules_cc", version = "0.0.10")
 
 http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -54,34 +54,34 @@ http_archive(
 http_archive(
     name = "clang_linux-x86_64",
     build_file = "//bazel/toolchain:clang.BUILD",
-    sha256 = "6c599d1aba568236064c340d7813324849896d5a4e2f3fd8225a8c31bfcbf884",
+    sha256 = "82302f8f0d9cb1062e60756147403c1525e965e1d7b777fab8076c74c7a5a19b",
     type = "zip",
-    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/linux-amd64/+/git_revision:2b0a708f41dd6291ee744704d43febc975e3d026",
+    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/linux-amd64/+/git_revision:910be4ff90d7d07bd4518ea03b85c0974672bf9c",
 )
 
 http_archive(
     name = "clang_win-x86_64",
     build_file = "//bazel/toolchain:clang.BUILD",
-    sha256 = "f49ba4123ee3958f2b47289d017a5b3f1ca01f82dd7a2168c45412c18101fd13",
+    sha256 = "2e9b8ac889838754e5305b6fd73c7bba7a6ec7364f1ce8ac60268b6d3bc61e6c",
     type = "zip",
     # Windows doesn't like `:` in the produced filename, so replace it with `%3A`.
-    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/windows-amd64/+/git_revision:2b0a708f41dd6291ee744704d43febc975e3d026".replace("git_revision:", "git_revision%3A"),
+    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/windows-amd64/+/git_revision:910be4ff90d7d07bd4518ea03b85c0974672bf9c".replace("git_revision:", "git_revision%3A"),
 )
 
 http_archive(
     name = "clang_mac-x86_64",
     build_file = "//bazel/toolchain:clang.BUILD",
-    sha256 = "d3516f2eb4c12d17ae77ee84c9226fbea581d4fb806910ceac4717d5adfcf748",
+    sha256 = "d3f2ef6f391ef66141092cfdf07facd18d2587a25616e1251e6e6b13b05ab3df",
     type = "zip",
-    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/mac-amd64/+/git_revision:2b0a708f41dd6291ee744704d43febc975e3d026",
+    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/mac-amd64/+/git_revision:910be4ff90d7d07bd4518ea03b85c0974672bf9c",
 )
 
 http_archive(
     name = "clang_mac-aarch64",
     build_file = "//bazel/toolchain:clang.BUILD",
-    sha256 = "68e551f41c7e9473063b09819f6ab8ec6e7e53677f4078189656cb14dc52984b",
+    sha256 = "61109b8464e9213ef8b9bfe55ce56298b94d4c66eaea308cf2b6556b0b85429e",
     type = "zip",
-    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/mac-arm64/+/git_revision:2b0a708f41dd6291ee744704d43febc975e3d026",
+    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/mac-arm64/+/git_revision:910be4ff90d7d07bd4518ea03b85c0974672bf9c",
 )
 
 new_git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
@@ -90,34 +90,41 @@ new_git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl"
 new_git_repository(
     name = "tinyusb",
     build_file = "//src/rp2_common/tinyusb:tinyusb.BUILD",
-    commit = "5217cee5de4cd555018da90f9f1bcc87fb1c1d3a",  # keep-in-sync-with-submodule: lib/tinyusb
+    commit = "86ad6e56c1700e85f1c5678607a762cfe3aa2f47",  # keep-in-sync-with-submodule: lib/tinyusb
     remote = "https://github.com/hathach/tinyusb.git",
 )
 
 # TODO: Provide btstack as a proper Bazel module.
 new_git_repository(
     name = "btstack",
     build_file = "//src/rp2_common/pico_btstack:btstack.BUILD",
-    commit = "2b49e57bd1fae85ac32ac1f41cdb7c794de335f6",  # keep-in-sync-with-submodule: lib/btstack
+    commit = "501e6d2b86e6c92bfb9c390bcf55709938e25ac1",  # keep-in-sync-with-submodule: lib/btstack
     remote = "https://github.com/bluekitchen/btstack.git",
 )
 
 # TODO: Provide cyw43-driver as a proper Bazel module.
 new_git_repository(
     name = "cyw43-driver",
     build_file = "//src/rp2_common/pico_cyw43_driver:cyw43-driver.BUILD",
-    commit = "cf924bb04c8984675ca0fc2178f082e404e048c3",  # keep-in-sync-with-submodule: lib/cyw43-driver
+    commit = "dd7568229f3bf7a37737b9e1ef250c26efe75b23",  # keep-in-sync-with-submodule: lib/cyw43-driver
     remote = "https://github.com/georgerobotics/cyw43-driver.git",
 )
 
 # TODO: Provide lwip as a proper Bazel module.
 new_git_repository(
     name = "lwip",
     build_file = "//src/rp2_common/pico_lwip:lwip.BUILD",
-    commit = "0a0452b2c39bdd91e252aef045c115f88f6ca773",  # keep-in-sync-with-submodule: lib/lwip
+    commit = "77dcd25a72509eb83f72b033d219b1d40cd8eb95",  # keep-in-sync-with-submodule: lib/lwip
     remote = "https://github.com/lwip-tcpip/lwip.git",
 )
 
+new_git_repository(
+    name = "mbedtls",
+    build_file = "//src/rp2_common/pico_mbedtls:mbedtls.BUILD",
+    commit = "107ea89daaefb9867ea9121002fbbdf926780e98",  # keep-in-sync-with-submodule: lib/mbedtls
+    remote = "https://github.com/Mbed-TLS/mbedtls.git",
+)
+
 register_toolchains(
     "//bazel/toolchain:linux-aarch64-rp2040",
     "//bazel/toolchain:linux-aarch64-rp2350",