Merge pull request #8 from ajf58/merge-2.1.0

Update to Pico SDK 2.1.0
zephyrproject-rtos · Jan 22, 2025 · 7b57b24 · 7b57b24
2 parents 79ee0f9 + c5d107a
commit 7b57b24
Show file tree

Hide file tree

Showing 267 changed files with 9,497 additions and 2,263 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1,7 +1,3 @@
-# Required for new toolchain resolution API.
-build --incompatible_enable_cc_toolchain_resolution
-build --@rules_cc//cc/toolchains:experimental_enable_rule_based_toolchains
-
 # Silence all C/C++ warnings in external code.
 common --per_file_copt=external/.*@-w
 common --host_per_file_copt=external/.*@-w

diff --git a/.github/workflows/bazel_build.yml b/.github/workflows/bazel_build.yml
@@ -0,0 +1,75 @@
+name: Bazel presubmit checks
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  bazel-build-check:
+    strategy:
+        matrix:
+          # TODO: Windows is currently broken.
+          os: [ubuntu-latest, macos-latest]
+        fail-fast: false
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Get Bazel
+        uses: bazel-contrib/setup-bazel@0.9.0
+        with:
+          # Avoid downloading Bazel every time.
+          bazelisk-cache: true
+          # Store build cache per workflow.
+          disk-cache: ${{ github.workflow }}
+          # Share repository cache between workflows.
+          repository-cache: true
+      # Only needed to drive the presbumit scripts.
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - name: Fetch latest Picotool
+        uses: actions/checkout@v4
+        with:
+          repository: raspberrypi/picotool
+          ref: develop
+          fetch-depth: 0
+          path: lib/picotool
+      - name: Full Bazel build with develop Picotool
+        run: python3 tools/run_all_bazel_checks.py --program=build --picotool-dir=lib/picotool
+      # Checks that the current BCR-requested version of Picotool builds.
+      - name: Bazel Picotool backwards compatibility
+        run: bazel build @picotool//:picotool
+  other-bazel-checks:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Get Bazel
+        uses: bazel-contrib/setup-bazel@0.9.0
+        with:
+          # Avoid downloading Bazel every time.
+          bazelisk-cache: true
+          # Store build cache per workflow.
+          disk-cache: ${{ github.workflow }}
+          # Share repository cache between workflows.
+          repository-cache: true
+      # Only needed to drive the presbumit scripts.
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - name: Fetch latest Picotool
+        uses: actions/checkout@v4
+        with:
+          repository: raspberrypi/picotool
+          ref: develop
+          fetch-depth: 0
+          path: lib/picotool
+      - name: Other Bazel checks
+        run: python3 tools/run_all_bazel_checks.py --program=other --picotool-dir=lib/picotool
diff --git a/.github/workflows/choco_packages.config b/.github/workflows/choco_packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="gcc-arm-embedded" version="10.2.1" />
-  <package id="cmake" version="3.25.2" installArguments="ADD_CMAKE_TO_PATH=System" />
+  <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>
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -23,7 +23,7 @@ jobs:
         mkdir -p "${{ github.workspace }}"
 
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Checkout submodules
       run: git submodule update --init

diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
@@ -9,15 +9,15 @@ on:
 
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: macos-latest
     steps:
       - name: Clean workspace
         run: |
           echo "Cleaning up previous run"
           rm -rf "${{ github.workspace }}"
           mkdir -p "${{ github.workspace }}"
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Checkout submodules
         run: git submodule update --init
       - name: Install dependencies

diff --git a/.github/workflows/multi-gcc.yml b/.github/workflows/multi-gcc.yml
@@ -20,7 +20,7 @@ jobs:
         mkdir -p "${{ github.workspace }}"
 
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Checkout submodules
       run: git submodule update --init

diff --git a/.github/workflows/scripts/generate_multi_gcc_workflow.py b/.github/workflows/scripts/generate_multi_gcc_workflow.py
@@ -55,7 +55,7 @@
         mkdir -p "${{ github.workspace }}"
 
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Checkout submodules
       run: git submodule update --init

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -17,15 +17,14 @@ jobs:
           echo "Cleaning up previous run"
           rm -rf "${{ github.workspace }}/pico-sdk"
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Checkout submodules
         run: git submodule update --init
       - name: Install dependencies
         run: choco install .github/workflows/choco_packages.config
 
       - name: Build Project
-        # bash required otherwise this mysteriously (no error) fails at "Generating cyw43_bus_pio_spi.pio.h"
-        shell: bash
+        shell: pwsh
         run: |
           mkdir build
           cd build

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .idea
 .vscode
 cmake-*
+.cache
 .DS_Store
 build
 build-*

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -22,4 +22,4 @@ If you are contributing new or updated code please match the existing code style
 
 ### Licensing 
 
-Code in this repository is lisensed under the [BSD-3 License](LICENSE.TXT). By contributing content to this repository you are agreeing to place your contributions under this licence.
+Code in this repository is licensed under the [BSD-3 License](LICENSE.TXT). By contributing content to this repository you are agreeing to place your contributions under this license.
diff --git a/ChangeLog.zephyr.md b/ChangeLog.zephyr.md
@@ -10,9 +10,12 @@ Need to take care to not break these changes when updating pico-sdk.
   - [#7] pico-sdk: hardware_timer: Don't add irq handler to interrupt vector
     - src/rp2_common/hardware_timer/timer.c
   - [#6] pico-sdk: hardware_timer: Add argument to irq handler to handle userdata
+    - src/host/hardware_timer/include/hardware/timer.h
     - src/rp2_common/hardware_timer/include/hardware/timer.h
     - src/rp2_common/hardware_timer/timer.c
+    - test/pico_time_test/pico_time_test.c
   - [#5] pico-sdk: Rename is_irq_enabled() to pico_is_irq_enabled()
+    - src/host/hardware_irq/include/hardware/irq.h
     - src/rp2_common/hardware_irq/include/hardware/irq.h
     - src/rp2_common/hardware_irq/irq.c
     - src/rp2_common/pico_multicore/multicore.c

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -1,31 +1,24 @@
 module(
     name = "pico-sdk",
-    version = "2.0.0",
+    version = "2.1.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.22.1")
-bazel_dep(name = "picotool", version = "2.0.0")
+bazel_dep(name = "rules_python", version = "0.36.0")
+bazel_dep(name = "picotool", version = "2.1.0")
+bazel_dep(name = "rules_cc", version = "0.0.10")
 
-# Note: rules_cc is special-cased repository; a dependency on rules_cc in a
-# module will not ensure that the root Bazel module has that same version of
-# rules_cc. For that reason, this primarily acts as a FYI. You'll still need
-# to explicitly list this dependency in your own project's MODULE.bazel file.
-bazel_dep(name = "rules_cc", version = "0.0.9")
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-# rules_cc v0.0.10 is not yet cut, so manually pull in the desired version.
-# This does not apply to dependent projects, so it needs to be copied to your
-# project's MODULE.bazel too.
-archive_override(
-    module_name = "rules_cc",
-    integrity = "sha256-zdQo/pQWKdIAPKSflBxOSWZNwCbc86T7SechKZo/3Xw=",
-    strip_prefix = "rules_cc-1acf5213b6170f1f0133e273cb85ede0e732048f",
-    urls = "https://github.com/bazelbuild/rules_cc/archive/1acf5213b6170f1f0133e273cb85ede0e732048f.tar.gz",
+http_archive(
+    name = "arm_gcc_linux-aarch64",
+    build_file = "//bazel/toolchain:gcc_arm_none_eabi.BUILD",
+    sha256 = "8fd8b4a0a8d44ab2e195ccfbeef42223dfb3ede29d80f14dcf2183c34b8d199a",
+    strip_prefix = "arm-gnu-toolchain-13.2.Rel1-aarch64-arm-none-eabi",
+    url = "https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-eabi.tar.xz",
 )
 
-http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
 http_archive(
     name = "arm_gcc_linux-x86_64",
     build_file = "//bazel/toolchain:gcc_arm_none_eabi.BUILD",
@@ -61,73 +54,73 @@ http_archive(
 http_archive(
     name = "clang_linux-x86_64",
     build_file = "//bazel/toolchain:clang.BUILD",
-    sha256 = "e12ee0db9226f5b4a4400c5eb2c0f757d7056181b651622b5453acb00105fd87",
+    sha256 = "6c599d1aba568236064c340d7813324849896d5a4e2f3fd8225a8c31bfcbf884",
     type = "zip",
-    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/linux-amd64/+/git_revision:248c53429427034f45705af60d47f3b1090c4799",
+    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/linux-amd64/+/git_revision:2b0a708f41dd6291ee744704d43febc975e3d026",
 )
 
 http_archive(
     name = "clang_win-x86_64",
     build_file = "//bazel/toolchain:clang.BUILD",
-    sha256 = "8c41e8b507f4dfede80842f98a716cac209f552064088fa1b7f4c64a1e547534",
+    sha256 = "f49ba4123ee3958f2b47289d017a5b3f1ca01f82dd7a2168c45412c18101fd13",
     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:248c53429427034f45705af60d47f3b1090c4799".replace("git_revision:", "git_revision%3A"),
+    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/windows-amd64/+/git_revision:2b0a708f41dd6291ee744704d43febc975e3d026".replace("git_revision:", "git_revision%3A"),
 )
 
 http_archive(
     name = "clang_mac-x86_64",
     build_file = "//bazel/toolchain:clang.BUILD",
-    sha256 = "1d92f52609d3c1e958fd56f5e9a68ab99b2042ddcc6e90a5eb5009cf7ac4897d",
+    sha256 = "d3516f2eb4c12d17ae77ee84c9226fbea581d4fb806910ceac4717d5adfcf748",
     type = "zip",
-    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/mac-amd64/+/git_revision:248c53429427034f45705af60d47f3b1090c4799",
+    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/mac-amd64/+/git_revision:2b0a708f41dd6291ee744704d43febc975e3d026",
 )
 
 http_archive(
     name = "clang_mac-aarch64",
     build_file = "//bazel/toolchain:clang.BUILD",
-    sha256 = "53184680db7e0043a8fba1556c7644b8f5e6c8cdffa4436a92a8e8adb0f45b8d",
+    sha256 = "68e551f41c7e9473063b09819f6ab8ec6e7e53677f4078189656cb14dc52984b",
     type = "zip",
-    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/mac-arm64/+/git_revision:248c53429427034f45705af60d47f3b1090c4799",
+    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/mac-arm64/+/git_revision:2b0a708f41dd6291ee744704d43febc975e3d026",
 )
 
+new_git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
+
 # TODO: Provide tinyusb as a proper Bazel module.
-http_archive(
+new_git_repository(
     name = "tinyusb",
     build_file = "//src/rp2_common/tinyusb:tinyusb.BUILD",
-    sha256 = "d64728aef58b80d5ce3747cad133f520da46e2b7ea3aadfda0e981aba6b658b3",
-    strip_prefix = "tinyusb-4232642899362fa5e9cf0dc59bad6f1f6d32c563",
-    url = "https://github.com/hathach/tinyusb/archive/4232642899362fa5e9cf0dc59bad6f1f6d32c563.tar.gz",
+    commit = "5217cee5de4cd555018da90f9f1bcc87fb1c1d3a",  # keep-in-sync-with-submodule: lib/tinyusb
+    remote = "https://github.com/hathach/tinyusb.git",
 )
 
 # TODO: Provide btstack as a proper Bazel module.
-http_archive(
+new_git_repository(
     name = "btstack",
     build_file = "//src/rp2_common/pico_btstack:btstack.BUILD",
-    sha256 = "64e86d9cf82b346e743fe1d4818b9380712b17abdb3f2c3524e92464b5ef3d19",
-    strip_prefix = "btstack-2b49e57bd1fae85ac32ac1f41cdb7c794de335f6",
-    url = "https://github.com/bluekitchen/btstack/archive/2b49e57bd1fae85ac32ac1f41cdb7c794de335f6.tar.gz",
+    commit = "2b49e57bd1fae85ac32ac1f41cdb7c794de335f6",  # keep-in-sync-with-submodule: lib/btstack
+    remote = "https://github.com/bluekitchen/btstack.git",
 )
 
-# TODO: Provide btstack as a proper Bazel module.
-http_archive(
+# 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",
-    sha256 = "0fcc7707fef95dd562d5572604713266613a27caeeae2f10afeccee9592a53ce",
-    strip_prefix = "cyw43-driver-faf36381bad1f668a30172b6336c9a970966ef4c",
-    url = "https://github.com/georgerobotics/cyw43-driver/archive/faf36381bad1f668a30172b6336c9a970966ef4c.tar.gz",
+    commit = "cf924bb04c8984675ca0fc2178f082e404e048c3",  # keep-in-sync-with-submodule: lib/cyw43-driver
+    remote = "https://github.com/georgerobotics/cyw43-driver.git",
 )
 
 # TODO: Provide lwip as a proper Bazel module.
-http_archive(
+new_git_repository(
     name = "lwip",
     build_file = "//src/rp2_common/pico_lwip:lwip.BUILD",
-    sha256 = "72856d557f72911cf6826ef745c23c54822df83a474557823241164a1d1361aa",
-    strip_prefix = "lwip-0a0452b2c39bdd91e252aef045c115f88f6ca773",
-    url = "https://github.com/lwip-tcpip/lwip/archive/0a0452b2c39bdd91e252aef045c115f88f6ca773.tar.gz",
+    commit = "0a0452b2c39bdd91e252aef045c115f88f6ca773",  # keep-in-sync-with-submodule: lib/lwip
+    remote = "https://github.com/lwip-tcpip/lwip.git",
 )
 
 register_toolchains(
+    "//bazel/toolchain:linux-aarch64-rp2040",
+    "//bazel/toolchain:linux-aarch64-rp2350",
     "//bazel/toolchain:linux-x86_64-rp2040",
     "//bazel/toolchain:linux-x86_64-rp2350",
     "//bazel/toolchain:win-x86_64-rp2040",
@@ -139,3 +132,19 @@ register_toolchains(
     # Require users to opt-in to the Pico SDK's toolchains.
     dev_dependency = True,
 )
+
+python = use_extension("@rules_python//python/extensions:python.bzl", "python")
+python.toolchain(
+    configure_coverage_tool = True,
+    python_version = "3.9",
+)
+
+use_repo(python, "pythons_hub")
+register_toolchains(
+    "@pythons_hub//:all",
+    dev_dependency = True,
+)
+register_toolchains(
+    "@rules_python//python/runtime_env_toolchains:all",
+    dev_dependency = True,
+)
diff --git a/README.md b/README.md
@@ -51,9 +51,9 @@ You can install the [Raspberry Pi Pico Visual Studio Code extension](https://mar
 These instructions are extremely terse, and Linux-based only. For detailed steps,
 instructions for other platforms, and just in general, we recommend you see [Raspberry Pi Pico-Series C/C++ SDK](https://rptl.io/pico-c-sdk)
 
-1. Install CMake (at least version 3.13), and a GCC cross compiler
+1. Install CMake (at least version 3.13), python 3, a native compiler, and a GCC cross compiler
    ```
-   sudo apt install cmake gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib
+   sudo apt install cmake python3 build-essential gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib
    ```
 1. Set up your project to point to use the Raspberry Pi Pico SDK
 
@@ -200,4 +200,4 @@ instructions for other platforms, and just in general, we recommend you see [Ras
 
 # RISC-V support on RP2350
 
-See [Raspberry Pi Pico-series C/C++ SDK](https://rptl.io/pico-c-sdk) for information on setting up a build environment for RISC-V on RP2350.
+See [Raspberry Pi Pico-series C/C++ SDK](https://rptl.io/pico-c-sdk) for information on setting up a build environment for RISC-V on RP2350.
-Original file line number
+Diff line change
@@ -1,6 +1,7 @@
     .idea
     .vscode
     cmake-*
+    .cache
     .DS_Store
     build
     build-*
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,4 @@ If you are contributing new or updated code please match the existing code style

		### Licensing

		Code in this repository is lisensed under the [BSD-3 License](LICENSE.TXT). By contributing content to this repository you are agreeing to place your contributions under this licence.
		Code in this repository is licensed under the [BSD-3 License](LICENSE.TXT). By contributing content to this repository you are agreeing to place your contributions under this license.